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