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 41d4729..29be643 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 @@ -645,6 +645,15 @@ public class PerformanceAppraisalPlanManage { List reUserList = groupList.stream() .map(PerformanceAppraisalProjectGroup::getReAppraisalUsers) .collect(Collectors.toList()); + List compareUsers = Lists.newArrayList(); + for (String reUser : reUserList) { + if (reUser.contains(StrPool.COMMA)){ + List users = Arrays.asList(reUser.split(StrPool.COMMA)); + compareUsers.addAll(users); + }else { + compareUsers.add(reUser); + } + } checkReAppraisalAndVerifyUsers(dto.getReAppraisalUsers(),reUserList,CommonConst.REAPPRAISAL_TYPE); group.setReAppraisalUsers(String.join(StrPool.COMMA, dto.getReAppraisalUsers())); } @@ -654,6 +663,15 @@ public class PerformanceAppraisalPlanManage { List verifyList = groupList.stream() .map(PerformanceAppraisalProjectGroup::getVerificationUsers) .collect(Collectors.toList()); + List compareUsers = Lists.newArrayList(); + for (String verifyUser : verifyList) { + if (verifyUser.contains(StrPool.COMMA)){ + List users = Arrays.asList(verifyUser.split(StrPool.COMMA)); + compareUsers.addAll(users); + }else { + compareUsers.add(verifyUser); + } + } checkReAppraisalAndVerifyUsers(dto.getVerificationUsers(),verifyList,CommonConst.VERIFY_TYPE); group.setVerificationUsers(String.join(StrPool.COMMA, dto.getVerificationUsers())); }