From 590b22029969736a6dc3de64464ac57cf7805960 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Sat, 12 Aug 2023 14:22:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E8=AE=A1=E5=88=92=E5=88=86=E7=BB=84=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/PerformanceAppraisalPlanManage.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java index c315e2c..e988521 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java @@ -634,7 +634,16 @@ public class PerformanceAppraisalPlanManage { List projectCodeList = groupList.stream() .map(PerformanceAppraisalProjectGroup::getProjectCodes) .collect(Collectors.toList()); - checkProjectCodes(dto.getProjectCodes(),projectCodeList); + List compareCodes = Lists.newArrayList(); + for (String projectCode : projectCodeList) { + if (projectCode.contains(StrPool.COMMA)){ + List codes = Arrays.asList(projectCode.split(StrPool.COMMA)); + compareCodes.addAll(codes); + }else { + compareCodes.add(projectCode); + } + } + checkProjectCodes(dto.getProjectCodes(),compareCodes); group.setProjectCodes(String.join(StrPool.COMMA, dto.getProjectCodes())); } if(CollUtil.isNotEmpty(dto.getReAppraisalUsers())){ @@ -652,7 +661,7 @@ public class PerformanceAppraisalPlanManage { compareUsers.add(reUser); } } - checkReAppraisalAndVerifyUsers(dto.getReAppraisalUsers(),reUserList,CommonConst.REAPPRAISAL_TYPE); + checkReAppraisalAndVerifyUsers(dto.getReAppraisalUsers(),compareUsers,CommonConst.REAPPRAISAL_TYPE); group.setReAppraisalUsers(String.join(StrPool.COMMA, dto.getReAppraisalUsers())); } if(CollUtil.isNotEmpty(dto.getVerificationUsers())){ @@ -670,7 +679,7 @@ public class PerformanceAppraisalPlanManage { compareUsers.add(verifyUser); } } - checkReAppraisalAndVerifyUsers(dto.getVerificationUsers(),verifyList,CommonConst.VERIFY_TYPE); + checkReAppraisalAndVerifyUsers(dto.getVerificationUsers(),compareUsers,CommonConst.VERIFY_TYPE); group.setVerificationUsers(String.join(StrPool.COMMA, dto.getVerificationUsers())); } group.setUpdateOn(LocalDateTime.now());