From e2aab00f3591a233ce87d0a97ab988ace61ef28d Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Sat, 12 Aug 2023 14:09:53 +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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 09cd1a6..c315e2c 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 @@ -643,6 +643,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())); } @@ -652,6 +661,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())); }