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列表之后,根据实际情况做相应的查询