orgId

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

@@ -2182,7 +2182,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
 
     @Override
     public List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List<String> configIds) {
-        if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){
+        if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(orgId)){
             return new ArrayList<>();
         }
         return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,orgId,dateId,configIds);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -33,7 +33,6 @@ import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
 import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity;
 import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
@@ -804,19 +803,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                 if(CollectionUtils.isNotEmpty(list)){
                     Map<String, FactIcuserCategoryAnalysisDailyDTO> configMap = list.stream().collect(Collectors.toMap(FactIcuserCategoryAnalysisDailyDTO::getConfigId, m -> m, (k1, k2) -> k1));
                     resList.forEach(resDto->{
-                        if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){/*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId());
+                        if(MapUtils.isNotEmpty(configMap)&&configMap.containsKey(resDto.getConfigId())){
-                String gridPids="";
-                if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){
-                    // 当前组织是根组织
-                    gridPids=formDTO.getOrgId();
-                }else {
-                    if("b09527201c4409e19d1dbc5e3c3429a1".equals(formDTO.getCustomerId())){
-                        //市北的是英文冒号隔开的
-                        gridPids=agencyEntity.getPids().concat(StrConstant.COMMA).concat(formDTO.getOrgId());
-                    }else{
-                        gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId());
-                    }
-                }*/
                             FactIcuserCategoryAnalysisDailyDTO dailyDTO=configMap.get(resDto.getConfigId());
                             resDto.setTotal(dailyDTO.getTotal());
                             resDto.setImmigration(dailyDTO.getQrIncr());