From 44a0ef1620cad87479390900eb6ded041c7b8d7b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 五月 2024 16:56:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 98 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 68 insertions(+), 30 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 6bf7765..715ab5c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -88,7 +88,6 @@
company.setStatus(Constants.ZERO);
company.setType(Constants.ZERO);
company.setSignStatus(Constants.ZERO);
- company.setType(Constants.ZERO);
company.setSignIdStatus(Constants.ZERO);
companyMapper.insert(company);
company.setEditDate(company.getCreateDate());
@@ -111,7 +110,7 @@
.or().eq(Company::getEmail,company.getEmail())
.or().eq(Company::getUsername,company.getUsername())
.or().eq(Company::getName,company.getName()))>0){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ュ晢鎴枫�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
company.setCreator(user.getId());
@@ -119,7 +118,6 @@
company.setType(Constants.ONE);
company.setIsdeleted(Constants.ZERO);
company.setStatus(Constants.ZERO);
- company.setType(Constants.ZERO);
company.setSignStatus(Constants.ZERO);
company.setSignIdStatus(Constants.ZERO);
companyMapper.insert(company);
@@ -196,6 +194,12 @@
.eq(SystemUser::getUsername,company.getUsername()))>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ櫥褰曡处鍙峰凡瀛樺湪锛岃鏇存柊閲嶈瘯~");
}
+ if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Boolean.TRUE)
+ .eq(SystemUser::getMobile,company.getPhone()))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ユ墜鏈哄彿宸插瓨鍦紝璇锋洿鎹㈤噸璇晘");
+ }
+
SystemUser user = new SystemUser();
user.setUsername(company.getUsername());
// 鐢熸垚瀵嗙爜鐩�
@@ -203,10 +207,11 @@
// 鐢熸垚瀵嗙爜
user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
user.setSalt(salt);
- user.setType(Constants.ONE);
+ user.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
user.setFixed(Boolean.TRUE);
user.setDeleted(Boolean.FALSE);
user.setCompanyId(company.getId());
+ user.setRealname(company.getLegalName());
user.setMobile(company.getPhone());
user.setCreateUser(company.getCreator());
user.setCreateTime(company.getCreateDate());
@@ -219,6 +224,12 @@
.eq(SystemUser::getUsername,company.getUsername()))>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ョ櫥褰曡处鍙峰凡瀛樺湪锛岃鏇存柊閲嶈瘯~");
}
+ if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted,Boolean.TRUE)
+ .ne(SystemUser::getUsername,company.getUsername())
+ .eq(SystemUser::getMobile,company.getPhone()))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ユ墜鏈哄彿宸插瓨鍦紝璇锋洿鏂伴噸璇晘");
+ }
SystemUser model = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted,Boolean.TRUE)
.eq(SystemUser::getUsername,oldUserName).last("limit 1"));
@@ -230,16 +241,18 @@
// 鐢熸垚瀵嗙爜
user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
user.setSalt(salt);
- user.setType(Constants.ONE);
+ user.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
user.setFixed(Boolean.TRUE);
user.setDeleted(Boolean.FALSE);
user.setCompanyId(company.getId());
user.setMobile(company.getPhone());
user.setCreateUser(company.getCreator());
+ user.setRealname(company.getLegalName());
user.setCreateTime(company.getCreateDate());
user.setStatus(Constants.ZERO);
systemUserMapper.insert(user);//鎻掑叆鏂扮殑绠＄悊鍛樿处鍙�
}else{
+ model.setMobile(company.getPhone());
model.setUsername(company.getUsername());
model.setCreateUser(company.getCreator());
model.setCreateTime(company.getCreateDate());
@@ -257,6 +270,7 @@
List<Integer> sIds = new ArrayList<>();
List<CompanySolution> list = new ArrayList<>();
int num =0;
+ Date date = new Date();
for(CompanySolution s :company.getSolutionList()){
if(Objects.isNull(s.getSolution())){
continue;
@@ -274,7 +288,7 @@
s.setIsdeleted(Constants.ZERO);
s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
s.setCanReduce(Constants.formatIntegerNum(s.getCanReduce()));
- s.setCreateDate(company.getCreateDate());
+ s.setCreateDate(date);
s.setCreator(company.getCreator());
s.setSortnum(num++);
s.setSolutionBaseId( s.getSolution().getBaseId() );
@@ -367,14 +381,14 @@
}else {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺惀涓氭墽鐓э紒");
}
- if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
- multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
- }else {
+// if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
+// multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
+// }else {
// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犵數瀛愮绔狅紒");
- }
+// }
if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null&& company.getIdcardImgList().size()>0){
for(Multifile f : company.getIdcardImgList()){
- multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
+ multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
}
}else {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犺韩浠借瘉鎵弿浠讹紒");
@@ -576,6 +590,7 @@
company.setCreateDate(update.getEditDate());
if(StringUtils.isNotBlank(company.getUsername())){
//澶勭悊鐧婚檰璐﹀彿淇℃伅
+ company.setType(model.getType());
dealSystemUserDataForUpdate(company,model.getUsername());
}
@@ -782,16 +797,27 @@
QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
company.setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(company.getQueryFlag() == 0){
- //鍙兘鐪嬫潈闄愯寖鍥村唴
- if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
- wrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
- }else {
- wrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ if(Constants.equalsInteger(company.getType(),Constants.ONE)){
+// return new ArrayList<>();
+ }else {
+ company.setType(Constants.ZERO);
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ //濡傛灉鏄晢鎴�
+ wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.company_id=company.id and c.shop_id="+user.getCompanyId());//璁剧疆鏃犳晥璁块棶
+ }else{
+ //濡傛灉鏌ヨ浼佷笟鏁版嵁
+ if(company.getQueryFlag() == 0){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ wrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ wrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
+ } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
+ //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
+ wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ }
}
- } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
- //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
- wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
}
return companyMapper.selectList(wrapper);
}
@@ -803,18 +829,30 @@
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(pageWrap.getModel().getQueryFlag() == 0){
- //鍙兘鐪嬫潈闄愯寖鍥村唴
- if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
- queryWrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
- }else {
- queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
- }
+ if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE||Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ZERO) {
+
+ }else{
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ //濡傛灉鏄晢鎴�
+ queryWrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//璁剧疆鏃犳晥璁块棶
+ }else{
+ //濡傛灉鏌ヨ浼佷笟鏁版嵁锛屽彧鑳界湅鏉冮檺鑼冨洿鍐�
+ if(pageWrap.getModel().getQueryFlag() == 0){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ queryWrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
// queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
- } else if (pageWrap.getModel().getQueryFlag() == 1) {
- //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
- queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ } else if (pageWrap.getModel().getQueryFlag() == 1) {
+ //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
+ queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ }
+ }
+
}
+
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Company::getId, pageWrap.getModel().getId());
}
--
Gitblit v1.9.3