|
|
@ -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; |
|
|
@ -795,7 +793,12 @@ public class EpmetUserServiceImpl implements EpmetUserService { |
|
|
|
// 当前组织是根组织
|
|
|
|
gridPids=formDTO.getOrgId(); |
|
|
|
}else { |
|
|
|
gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId()); |
|
|
|
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)){ |
|
|
|