Bladeren bron

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

master
CMM 1 jaar geleden
bovenliggende
commit
1df704cf8e
1 gewijzigde bestanden met toevoegingen van 5 en 1 verwijderingen
  1. +5
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java

+ 5
- 1
pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java Bestand weergeven

@@ -570,7 +570,11 @@ public class PerformanceAppraisalPlanManage {
allEmployeeCodes.addAll(CodeUtil.convertStrToList(group.getReAppraisalUsers()));
allEmployeeCodes.addAll(CodeUtil.convertStrToList(group.getVerificationUsers()));
if(CollUtil.isNotEmpty(allEmployeeCodes)){
List<UserFullInfoDTO> users = userInfoHelper.getUserFullInfoByEmployeeCodes(allEmployeeCodes);
List<UserFullInfoDTO> users = Lists.newArrayList();
for (String employeeCode : allEmployeeCodes) {
UserFullInfoDTO userFullInfoDto = userInfoHelper.getUserFullInfoByEmployeeCode(employeeCode);
users.add(userFullInfoDto);
}
if(CollUtil.isNotEmpty(users)){
userMap = users.stream().collect(Collectors.toMap(UserFullInfoDTO::getEmployeeCode,u -> u));
}


Laden…
Annuleren
Opslaan