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

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);