Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -172,7 +172,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         List<CategoryAnalysisResultDTO> resultList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(resultDTOList)) {
             for (CategoryAnalysisResultDTO dto : resultDTOList) {
-                CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), dto.getCategoryOriginCustomerId());
+                CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), customerId);
                 if (null == projectCategoryDTO || StringUtils.isBlank(projectCategoryDTO.getCategoryName())) {
                     log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", dto.getCategoryCode(), customerId));
                     continue;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridAndOrgDailyServiceImpl.java

@@ -174,6 +174,7 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr
                     continue;
                 }
             }
+            subCustomerIds.add(customerId);
             List<GridAndOrgCategoryCountResultDTO> allAgencies = screenCustomerAgencyDao.selectParentSonAgency(subCustomerIds, PingYinConstant.KONG_CUN_CUSTOMER_ID);
             log.info("父子关系所有组织{}",allAgencies);
             List<List<GridAndOrgCategoryCountResultDTO>> partition = ListUtils.partition(allAgencies, NumConstant.FIFTY);