Pārlūkot izejas kodu

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

master
CMM pirms 1 gada
vecāks
revīzija
51986d92eb
2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java
  2. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/VerifyManage.java

+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java Parādīt failu

@@ -318,7 +318,7 @@ public class ReAppraisalManage {
.eq(PerformanceAppraisalScoreInfo::getAppraisalType, AppraisalTypeEnum.RE_APPRAISAL.getCode()));
// 判断打分人员是否为分组内的复评人员
if (CollUtil.isNotEmpty(scoreInfoList)) {
List<String> users = scoreInfoList.stream().map(PerformanceAppraisalScoreInfo::getAppraisalEmployeeCode).collect(Collectors.toList());
Set<String> users = scoreInfoList.stream().map(PerformanceAppraisalScoreInfo::getAppraisalEmployeeCode).collect(Collectors.toSet());
if (CollUtil.isNotEmpty(users)) {
String reAppraisalUsers = group.getReAppraisalUsers();
String join = String.join(StrPool.COMMA, users);


+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/VerifyManage.java Parādīt failu

@@ -318,7 +318,7 @@ public class VerifyManage {

// 判断打分人员是否为分组内的核查人员
if (CollUtil.isNotEmpty(scoreInfoList)) {
List<String> users = scoreInfoList.stream().map(PerformanceAppraisalScoreInfo::getAppraisalEmployeeCode).collect(Collectors.toList());
Set<String> users = scoreInfoList.stream().map(PerformanceAppraisalScoreInfo::getAppraisalEmployeeCode).collect(Collectors.toSet());
if (CollUtil.isNotEmpty(users)) {
String verificationUsers = group.getVerificationUsers();
String join = String.join(StrPool.COMMA, users);


Notiek ielāde…
Atcelt
Saglabāt