Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/CommonBusinessService.java

@@ -187,7 +187,7 @@ public class CommonBusinessService {
             CooperateManageQueryResVo cooperateManageQueryResVo = new CooperateManageQueryResVo();
             cooperateManageQueryResVo.setId(cooperateManageQueryResDto.getId());
             cooperateManageQueryResVo.setCooperateTypes(cooperateManageQueryResDto.getTypes());
-            cooperateManageQueryResVo.setCreateTime(cooperateManageQueryResDto.getCreateTime());
+
             cooperateManageQueryResVo.setRemark(cooperateManageQueryResDto.getRemark());
             cooperateManageQueryResVo.setStatus(cooperateManageQueryResDto.getStatus());
             cooperateManageQueryResVo.setApplyTypeCode(cooperateManageQueryResDto.getApplyTypeCode());
@@ -213,12 +213,42 @@ public class CommonBusinessService {
                 cooperateManageQueryResVo.setManagerId(cooperateManageQueryResDto.getInviteeContactsId());
             }
 
+            //转换合作属性
+            String types = cooperateManageQueryResDto.getTypes();
+            List<Integer> typeList = Arrays.stream(types.split(Global.COMMA)).map(Integer::parseInt).distinct().toList();
+            if (!Objects.equals(LoginUserHolder.getEntId(), cooperateManageQueryResDto.getEntId())) {
+                List<Integer> targetTypes = new ArrayList<>();
+                for (Integer type : typeList) {
+                    targetTypes.add(changeCooperateType(type));
+                }
+                cooperateManageQueryResVo.setCooperateTypes(String.join(Global.COMMA,targetTypes.stream().distinct().map(String::valueOf).toList()));
+            }
+
             result.add(cooperateManageQueryResVo);
         }
         return result;
     }
 
 
+    public Integer changeCooperateType(Integer type) {
+        if (type.equals(CooperateTypeEnum.SUPPLIER.getCode())) {
+            return CooperateTypeEnum.PURCHASER.getCode();
+        }
+
+        if (type.equals(CooperateTypeEnum.PURCHASER.getCode())) {
+            return CooperateTypeEnum.SUPPLIER.getCode();
+        }
+
+        if (type.equals(CooperateTypeEnum.CONSIGN.getCode())) {
+            return CooperateTypeEnum.CARRIAGE.getCode();
+        }
+
+        if (type.equals(CooperateTypeEnum.CARRIAGE.getCode())) {
+            return CooperateTypeEnum.CONSIGN.getCode();
+        }
+        return null;
+    }
+
     /**
      * @return FindListGroupResVo
      * @desc: 初始化分组返参

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -339,18 +339,30 @@ public class KwmCooperateManageService {
             return null;
         }
 
-        LambdaQueryWrapper<KwmCooperateType> kwmCooperateTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        kwmCooperateTypeLambdaQueryWrapper.in(KwmCooperateType::getCooperateId, kwmCooperates.stream().map(KwmCooperate::getId).toList());
-        kwmCooperateTypeLambdaQueryWrapper.eq(KwmCooperateType::getDelFlag, Global.NO);
-        kwmCooperateTypeLambdaQueryWrapper.eq(KwmCooperateType::getStatus, CooperateStatusEnum.OK.getCode());
-        kwmCooperateTypeLambdaQueryWrapper.eq(KwmCooperateType::getType, reqVo.getCooperateType());
-        List<KwmCooperateType> kwmCooperateTypes = kwmCooperateTypeMapper.selectList(kwmCooperateTypeLambdaQueryWrapper);
-        if (CollectionUtils.isEmpty(kwmCooperateTypes)) {
-            return null;
+        List<KwmCooperateType> kwmCooperateTypeList = new ArrayList<>();
+        for (KwmCooperate kwmCooperate : kwmCooperates) {
+            Integer type = reqVo.getCooperateType();
+            if (!kwmCooperate.getEntId().equals(reqVo.getId())) {
+                type = commonBusinessService.changeCooperateType(type);
+            }
+            LambdaQueryWrapper<KwmCooperateType> kwmCooperateTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            kwmCooperateTypeLambdaQueryWrapper.eq(KwmCooperateType::getCooperateId, kwmCooperate.getId());
+            kwmCooperateTypeLambdaQueryWrapper.eq(KwmCooperateType::getDelFlag, Global.NO);
+            kwmCooperateTypeLambdaQueryWrapper.eq(KwmCooperateType::getStatus, CooperateStatusEnum.OK.getCode());
+            kwmCooperateTypeLambdaQueryWrapper.eq(KwmCooperateType::getType, type);
+            List<KwmCooperateType> kwmCooperateTypes = kwmCooperateTypeMapper.selectList(kwmCooperateTypeLambdaQueryWrapper);
+            if (CollectionUtils.isNotEmpty(kwmCooperateTypes)) {
+                kwmCooperateTypeList.addAll(kwmCooperateTypes);
+            }
         }
 
+        if (CollectionUtils.isEmpty(kwmCooperateTypeList)) {
+            return Collections.emptyList();
+        }
+
+
         //装对方企业的id
-        List<Long> kwmCooperateIdList = kwmCooperateTypes.stream().map(KwmCooperateType::getCooperateId).toList();
+        List<Long> kwmCooperateIdList = kwmCooperateTypeList.stream().map(KwmCooperateType::getCooperateId).toList();
         kwmCooperates = kwmCooperates.stream().filter(item -> kwmCooperateIdList.contains(item.getId())).toList();
         if (CollectionUtils.isEmpty(kwmCooperates)) {
             return null;

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -9,8 +9,6 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.model.KwsUser;
-import com.sckw.system.model.vo.req.IdReqVo;
-import com.sckw.system.model.vo.req.QueryEntUserReqVo;
 import com.sckw.system.model.vo.req.ResetPasswordReqVo;
 import com.sckw.system.model.vo.req.UserAddReqVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
@@ -174,7 +172,7 @@ public class KwsUserController {
 
     @PostMapping("testApprove")
     public HttpResult testApprove() {
-        commonService.test();
+//        commonService.test();
         return HttpResult.ok(HttpStatus.MSG_004);
     }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsRoleService.java

@@ -121,7 +121,7 @@ public class KwsRoleService {
 
         /*2、绑定菜单功能*/
         RoleBindMenuReqVo roleBindMenuReqVo = new RoleBindMenuReqVo();
-        if (!reqVo.getIsManage()) {
+        if (Objects.isNull(reqVo.getIsManage()) || !reqVo.getIsManage()) {
             roleBindMenuReqVo.setRoleId(roleId);
         }
         roleBindMenuReqVo.setEntId(kwsDept.getEntId());