统计报表接口,数据梳理接口

This commit is contained in:
shuo.wang
2025-05-16 13:30:43 +08:00
parent 4c243b31ea
commit 28b3851c71

View File

@@ -96,7 +96,7 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
response = responseByRegionIdMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new FranchiseReportResponse()); response = responseByRegionIdMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new FranchiseReportResponse());
} }
if (CollectionUtils.isNotEmpty(request.getJoinGroupName()) && CollectionUtils.isNotEmpty(request.getRegionIds())) { if (CollectionUtils.isNotEmpty(request.getJoinGroupName()) || CollectionUtils.isNotEmpty(request.getRegionIds())) {
response.setRegionId(shopFranchiseReportDTO.getRegionId()); response.setRegionId(shopFranchiseReportDTO.getRegionId());
response.setRegionName(bigRegionDO.getRegionName()); response.setRegionName(bigRegionDO.getRegionName());
String groupName = bigRegionDO.getGroupName(); String groupName = bigRegionDO.getGroupName();