Merge branch 'ls2_performance_appraisal_0801' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java

@@ -636,7 +636,16 @@ public class PerformanceAppraisalPlanManage {
             List<String> projectCodeList = groupList.stream()
                     .map(PerformanceAppraisalProjectGroup::getProjectCodes)
                     .collect(Collectors.toList());
-            checkProjectCodes(dto.getProjectCodes(),projectCodeList);
+            List<String> compareCodes = Lists.newArrayList();
+            for (String projectCode : projectCodeList) {
+                if (projectCode.contains(StrPool.COMMA)){
+                    List<String> 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())){
@@ -654,7 +663,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())){
@@ -672,7 +681,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());