统计报表接口,数据梳理接口
This commit is contained in:
@@ -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();
|
||||||
|
|||||||
Reference in New Issue
Block a user