From 5056b731dcaebbc3a48a4a910413cc4dd6c9c19a Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 11 四月 2024 15:36:12 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 67 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 26 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 3a539a9..69c148e 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
@@ -201,10 +201,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());
@@ -228,12 +229,13 @@
// 鐢熸垚瀵嗙爜
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);//鎻掑叆鏂扮殑绠＄悊鍛樿处鍙�
@@ -575,6 +577,7 @@
company.setCreateDate(update.getEditDate());
if(StringUtils.isNotBlank(company.getUsername())){
//澶勭悊鐧婚檰璐﹀彿淇℃伅
+ company.setType(model.getType());
dealSystemUserDataForUpdate(company,model.getUsername());
}
@@ -782,22 +785,27 @@
company.setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(company.getType(),Constants.ONE)){
-
- }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());
+// 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);
}
@@ -811,20 +819,27 @@
if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE) {
}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());
- }
+ 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