Merge remote-tracking branch 'remotes/origin/dev_oper_export' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -2005,7 +2005,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
         CustomerDataManageResultDTO resultDTO = getDataManageResultDTO(formDTO, startTimeForm, agencyGrid.getAgencyGridList(),agencyGrid.getLevel());
         resultDTO.setTotal(idList.size());
         //网格List不为空则 查询网格数据 (仅限查询组织id为街道级别时)
-        if (CollectionUtils.isNotEmpty(resultDTO.getAllGridList())){
+        if (CollectionUtils.isNotEmpty(agencyGrid.getAllGridList())){
             formDTO.setDataType(OrgTypeEnum.GRID.getCode());
             idList = agencyGrid.getAllGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList());
             formDTO.setIdList(idList);