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

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

@@ -142,8 +142,6 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr
         log.info("开始执行组织项目分类统计");
         long start = System.currentTimeMillis();
         List<CustomerRelationEntity> relationInfo = relationService.selectSubCustomer(customerId);
-        List<String> customerIds = new ArrayList<>();
-        customerIds.add(customerId);
         List<GridAndOrgCategoryCountResultDTO> result = new ArrayList<>();
         if (CollectionUtils.isEmpty(relationInfo)){
             // one customer
@@ -169,7 +167,7 @@ public class ScreenProjectCategoryGridAndOrgDailyServiceImpl implements ScreenPr
             List<String> subCustomerIds = relationInfo.stream().map(CustomerRelationEntity::getCustomerId).collect(Collectors.toList());
             for (int i = NumConstant.ZERO; i < subCustomerIds.size(); i++) {
                 if (subCustomerIds.get(i).equals(PingYinConstant.KONG_CUN_CUSTOMER_ID)){
-                    customerIds.remove(i);
+                    subCustomerIds.remove(i);
                     continue;
                 }
             }