Merge remote-tracking branch 'origin/dev'

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

@@ -35,8 +35,6 @@ 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.entity.epmetuser.*;
-import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService;
@@ -794,9 +792,14 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                 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());
                     }
+                }
                 List<FactIcuserCategoryAnalysisDailyDTO> list = dataStatsService.queryAgencyIcUserCategoryData(gridPids, formDTO.getDateId(), configIds);
                 if(CollectionUtils.isNotEmpty(list)){
                     Map<String, FactIcuserCategoryAnalysisDailyDTO> configMap = list.stream().collect(Collectors.toMap(FactIcuserCategoryAnalysisDailyDTO::getConfigId, m -> m, (k1, k2) -> k1));