From 18ef454c809d66e4c8be676e8f1d121878e59d8f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 23 Jun 2022 10:34:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E3=80=91=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=AE=A2=E6=88=B7=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=9D=E5=A7=8B=E5=8C=96=E5=88=86=E7=B1=BB=E5=AD=97?= =?UTF-8?q?=E5=85=B8=EF=BC=8C=E9=82=A3=E5=B0=B1=E4=BD=BF=E7=94=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=88=86=E7=B1=BB=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 604b46dda8..1738ddabd6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -87,9 +87,15 @@ public class CoverageServiceImpl implements CoverageService { if (CollectionUtils.isNotEmpty(categoryKeys)) { // 有分类keys，使用分类keys查询，使用coverageTypes分组 mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys, customerId); + if (mapping == null || mapping.size() == 0) { + mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys, "default"); + } } else { // 没有分类keys，使用coverageTypes直接查询 mapping = orgCoverageService.getMappingRelationByCoverageType(coverageTypes, customerId); + if (mapping == null || mapping.size() == 0) { + mapping = orgCoverageService.getMappingRelationByCoverageType(categoryKeys, "default"); + } } // 2.循环coverageTypes，使用key到map中查询(为了顺序)，得到categoryKeys列表之后，根据实际情况做相应的查询