diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index b7a018798..f38099ef4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -155,7 +155,12 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { } } - List list = new ArrayList<>(responseByRegionIdMap.values()); + List list = new ArrayList<>(); + if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { + list.addAll(responseByJoinGroupNameMap.values()); + }else{ + list.addAll(responseByRegionIdMap.values()); + } if (CollectionUtils.isEmpty(list)) { log.info("数据为空"); return Collections.emptyList();