Merge remote-tracking branch 'origin/dev' into dev

pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java

@@ -60,7 +60,7 @@ public class PerformanceAppraisalConveter {
                 if(map.containsKey(a.getApplicationId())){
                     ProjectApplication application = map.get(a.getApplicationId());
                     vo.setApplicationName(StringUtils.isNotBlank(application.getApplicationName())?
-                            application.getApplicationName() : application.getAccountAppName());
+                            application.getApplicationName() : application.getRelatedExistsApplication());
                     vo.setApplicationType(application.getApplicationType());
                     vo.setBizDomain(application.getBizDomain());
                     vo.setBuildOrgName(application.getBuildOrgName());

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

@@ -432,7 +432,7 @@ public class PerformanceAppraisalPlanManage {
 
         Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class).in(ProjectApplication::getId, applicationIds)).stream()
                 .collect(Collectors.toMap(ProjectApplication::getId, a -> a));
-        for(Long applicationId : applicationIds){
+        for(Long applicationId : applicationIdList){
             PerformanceAppraisalApplication paa = new PerformanceAppraisalApplication();
             paa.setAppraisalId(id);
             paa.setApplicationId(applicationId);