支部建设、联建共建下级列表接口修改

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -134,6 +134,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
     public WorkRecordRankResultDTO rankList(WorkRecordRankFormDTO formDTO) {
         List<String> customerIds=new ArrayList<>();
         Result<List<String>> result=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
+        // log.info("result:  "+JSON.toJSONString(result));
         if (result.success() && CollectionUtils.isNotEmpty(result.getData())) {
             customerIds.addAll(result.getData());
         }
@@ -144,23 +145,24 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         }
         WorkRecordRankResultDTO returnDto = new WorkRecordRankResultDTO();
         AgencyInfoDTO agencyInfoDTO = agencyService.getAgencyInfoDTO(formDTO.getAreaCode(), formDTO.getAgencyId());
+        // log.info("agencyInfoDTO:  "+JSON.toJSONString(agencyInfoDTO));
         //当前组织的自身的数据
         List<WorkRecordSubRank> currentAgency = baseDao.selectCurrentAgency(formDTO.getAgencyId(),
                 formDTO.getDataType(),
                 formDTO.getCustomerId(),
                 dateId);
         //下级所有组织
-        List<WorkRecordSubRank> subAgencyRankList = baseDao.selectSubList(
-                CollectionUtils.isNotEmpty(agencyInfoDTO.getSubAgencyIds()) ? agencyInfoDTO.getSubAgencyIds() : new ArrayList<>(),
+        List<WorkRecordSubRank> subAgencyRankList = CollectionUtils.isNotEmpty(agencyInfoDTO.getSubAgencyIds()) ? baseDao.selectSubList(
+                agencyInfoDTO.getSubAgencyIds(),
                 formDTO.getDataType(),
                 formDTO.getCustomerId(),
-                dateId);
+                dateId) : new ArrayList<>();
         //直属网格
-        List<WorkRecordSubRank> subGridList = baseDao.selectSubGridList(
-                CollectionUtils.isNotEmpty(agencyInfoDTO.getSubGridIds()) ? agencyInfoDTO.getSubGridIds() : new ArrayList<>(),
+        List<WorkRecordSubRank> subGridList = CollectionUtils.isNotEmpty(agencyInfoDTO.getSubGridIds()) ? baseDao.selectSubGridList(
+                agencyInfoDTO.getSubGridIds(),
                 formDTO.getDataType(),
                 formDTO.getCustomerId(),
-                dateId);
+                dateId) : new ArrayList<>();
 
         returnDto.getSubRankList().addAll(subAgencyRankList);
         returnDto.getSubRankList().addAll(subGridList);