From 768d0a60b64ee4a637628e0674db0fc059253063 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 4 Aug 2022 16:20:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/govorg/impl/GovOrgServiceImpl.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) 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 f9772a9f47..84a8b7a276 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 @@ -1188,12 +1188,8 @@ public class GovOrgServiceImpl implements GovOrgService { dto.setOrgId(grid.getId()); dto.setOrgType(OrgConstant.GRID); dto.setOrgName(grid.getGridName()); - if (projectMap.containsKey(grid.getId())) { - dto.setProjectCount(projectMap.get(grid.getId())); - } - if (closedMap.containsKey(grid.getId())) { - dto.setClosedCount(closedMap.get(grid.getId())); - } + dto.setProjectCount(projectMap.getOrDefault(grid.getId(), NumConstant.ZERO)); + dto.setClosedCount(closedMap.getOrDefault(grid.getId(), NumConstant.ZERO)); if (memberMap.containsKey(grid.getId())) { dto.setMemberCount(Math.toIntExact(memberMap.get(grid.getId()))); if (NumConstant.ZERO != dto.getMemberCount()) { @@ -1296,12 +1292,9 @@ public class GovOrgServiceImpl implements GovOrgService { //统计关闭项目数 Map closedMap = govProjectService.getMemberClosedProjectMap(formDTO); result.getList().forEach(item -> { - if (projectMap.containsKey(item.getStaffId())) { - item.setProjectCount(projectMap.get(item.getStaffId())); - } - if (projectMap.containsKey(item.getStaffId())) { - item.setClosedCount(closedMap.get(item.getStaffId())); - } + item.setProjectCount(projectMap.getOrDefault(item.getStaffId(), NumConstant.ZERO)); + item.setClosedCount(closedMap.getOrDefault(item.getStaffId(), NumConstant.ZERO)); + if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(item.getOrgId()); if (null != agencyInfo) {