From 479021de1eec8664a122c848014d87a8a1490f30 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 18 Jul 2023 09:34:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?api=20=E5=AE=9E=E4=BD=93=20irs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmapi/src/main/java/com/ningdatech/pmapi/irs/model/dto/ApiDTO.java | 3 ++- .../java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/model/dto/ApiDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/model/dto/ApiDTO.java index 89bf41d..b09265e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/model/dto/ApiDTO.java +++ b/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; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java index 02b7b88..a5dadb6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java @@ -151,8 +151,7 @@ public class ApplicationManage { List projectCodes = page.getRecords().stream().map(Project::getProjectCode).collect(Collectors.toList()); //要去查询应用 List apps = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class) - .in(ProjectApplication::getProjectCode, projectCodes) - .isNull(ProjectApplication::getAppCode)); + .in(ProjectApplication::getProjectCode, projectCodes)); Map> appMap = apps.stream().collect(Collectors.groupingBy(ProjectApplication::getProjectCode)); List res = page.getRecords().stream().map(p -> { ProjectDetailVO vo = BeanUtil.copyProperties(p,ProjectDetailVO.class); From 3a8a14615b2ba6f3fd3cf631101fca3ef70a1c59 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 18 Jul 2023 09:36:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?api=20=E5=AE=9E=E4=BD=93=20irs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java index 43b37be..192c97a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java +++ b/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(); }