From c0ffb08f68b2ee997aac0b52fd90e639c209abae Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 18:07:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=84=E7=BB=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govorg/result/OrgProjectDetailResultDTO.java | 1 + .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java index 302e232d8d..8f8c980c61 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java @@ -15,6 +15,7 @@ import java.io.Serializable; public class OrgProjectDetailResultDTO implements Serializable { private static final long serialVersionUID = 6333117500929136144L; private String orgId; + private String orgType; private String orgName; private Integer memberCount = 0; private Integer projectCount = 0; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 6f5682e99f..99318e966c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1166,7 +1166,7 @@ public class GovOrgServiceImpl implements GovOrgService { } CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); if (null == agencyEntity) { - return null; + return new PageData<>(Collections.emptyList(), NumConstant.ZERO); } PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); long total = 0; @@ -1188,6 +1188,7 @@ public class GovOrgServiceImpl implements GovOrgService { resultList = gridList.stream().map(grid -> { OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO(); dto.setOrgId(grid.getId()); + dto.setOrgType(OrgConstant.GRID); dto.setOrgName(grid.getGridName()); if (projectMap.containsKey(grid.getId())) { dto.setProjectCount(projectMap.get(grid.getId())); @@ -1227,6 +1228,7 @@ public class GovOrgServiceImpl implements GovOrgService { resultList = agencyList.stream().map(agency -> { OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO(); dto.setOrgId(agency.getId()); + dto.setOrgType(OrgConstant.AGENCY); dto.setOrgName(agency.getOrganizationName()); if (projectMap.containsKey(agency.getId())) { dto.setProjectCount(projectMap.get(agency.getId()).getProjectTotal());