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

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

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

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

@@ -92,9 +92,8 @@ public class PerformanceAppraisalPlanManage {
      * @return
      */
     public PageVo<PerformanceAppraisalVO> list(PerformanceAppraisalListReq req) {
-        UserInfoDetails userDetail = LoginUserUtil.loginUserDetail();
-        String regionCode = userDetail.getRegionCode();
         Page<PerformanceAppraisal> page = req.page();
+        String regionCode = req.getRegionCode();
         LambdaQueryWrapper<PerformanceAppraisal> wrapper = Wrappers.lambdaQuery(PerformanceAppraisal.class)
                 .like(StringUtils.isNotBlank(req.getPlanName()),PerformanceAppraisal::getName,req.getPlanName())
                 .ge(Objects.nonNull(req.getStart()),PerformanceAppraisal::getCreateOn,req.getStart())
@@ -909,7 +908,7 @@ public class PerformanceAppraisalPlanManage {
             vo.setAppId(r.getId());
             vo.setAppraisalProjectId(r.getProjectId());
             vo.setAppraisalProjectCode(r.getProjectCode());
-            vo.setApplicationName(Objects.nonNull(r.getApplicationName()) ? r.getApplicationName() : r.getRelatedExistsApplication());
+            vo.setApplicationName(Objects.nonNull(r.getRelatedExistsApplication()) ? r.getRelatedExistsApplication() : r.getApplicationName());
             vo.setBuildOrgName(r.getBuildOrgName());
             vo.setApplicationType(r.getApplicationType());
             vo.setBizDomain(r.getBizDomain());