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

pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java

@@ -449,7 +449,8 @@ public class PerformanceAppraisalPlanManage {
             throw new BizException(names + CommonConst.APP_REPEAT);
         }
 
-        Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class).in(ProjectApplication::getId, applicationIds)).stream()
+        Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
+                        .in(ProjectApplication::getId, applicationIdList)).stream()
                 .collect(Collectors.toMap(ProjectApplication::getId, a -> a));
         for(Long applicationId : applicationIdList){
             PerformanceAppraisalApplication paa = new PerformanceAppraisalApplication();
@@ -532,10 +533,10 @@ public class PerformanceAppraisalPlanManage {
                 .eq(PerformanceAppraisalAppScoreInfo::getAppraisalId,editDTO.getId())
                 .in(PerformanceAppraisalAppScoreInfo::getApplicationId,applicationIdList));
 
-        List<Long> applicationIds = editDTO.getApplicationIds();
-        Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class).in(ProjectApplication::getId, applicationIds)).stream()
+        Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
+                        .in(ProjectApplication::getId, applicationIdList)).stream()
                 .collect(Collectors.toMap(ProjectApplication::getId, a -> a));
-        for(Long applicationId : applicationIds){
+        for(Long applicationId : applicationIdList){
             PerformanceAppraisalApplication paa = new PerformanceAppraisalApplication();
             paa.setAppraisalId(editDTO.getId());
             paa.setApplicationId(applicationId);