Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java

@@ -166,8 +166,8 @@ public class AppIrsManage {
         log.info("查询应用目录 : {}",JSON.toJSONString(forEntity));
 
         if(Objects.nonNull(forEntity.getBody()) && Objects.nonNull(forEntity.getBody().getData())
-                && CollUtil.isNotEmpty(forEntity.getBody().getData().getApiApplySearchResult())){
-            return forEntity.getBody().getData().getApiApplySearchResult().get(0);
+                && CollUtil.isNotEmpty(forEntity.getBody().getDatas().getApiApplySearchResult())){
+            return forEntity.getBody().getDatas().getApiApplySearchResult().get(0);
         }
         return null;
     }
@@ -187,8 +187,8 @@ public class AppIrsManage {
         log.info("查询应用目录 : {}",JSON.toJSONString(forEntity));
 
         if(Objects.nonNull(forEntity.getBody()) && Objects.nonNull(forEntity.getBody().getData())
-                && CollUtil.isNotEmpty(forEntity.getBody().getData().getApiApplySearchResult())){
-            return forEntity.getBody().getData().getApiApplySearchResult();
+                && CollUtil.isNotEmpty(forEntity.getBody().getDatas().getApiApplySearchResult())){
+            return forEntity.getBody().getDatas().getApiApplySearchResult();
         }
         return Collections.emptyList();
     }

pmapi/src/main/java/com/ningdatech/pmapi/irs/model/dto/ApiDTO.java

@@ -15,5 +15,6 @@ import java.util.List;
 public class ApiDTO {
     private String code;
     private String msg;
-    private ApiSearchResult data;
+    private String data;
+    private ApiSearchResult datas;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java

@@ -151,8 +151,7 @@ public class ApplicationManage {
         List<String> projectCodes = page.getRecords().stream().map(Project::getProjectCode).collect(Collectors.toList());
         //要去查询应用
         List<ProjectApplication> apps = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
-                .in(ProjectApplication::getProjectCode, projectCodes)
-                .isNull(ProjectApplication::getAppCode));
+                .in(ProjectApplication::getProjectCode, projectCodes));
         Map<String, List<ProjectApplication>> appMap = apps.stream().collect(Collectors.groupingBy(ProjectApplication::getProjectCode));
         List<ProjectDetailVO> res = page.getRecords().stream().map(p -> {
             ProjectDetailVO vo = BeanUtil.copyProperties(p,ProjectDetailVO.class);