From 282df797cc2cea0cf5a7002ff905c0678f6f8422 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Jan 2022 11:41:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=8C=97=E7=9A=84=E7=BB=84=E7=BB=87pi?= =?UTF-8?q?ds=E6=98=AF=E8=8B=B1=E6=96=87=E9=80=97=E5=8F=B7=E9=9A=94?= =?UTF-8?q?=E5=BC=80=EF=BC=8C=E5=85=88=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index cbe81adec8..7000dc6f32 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/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; @@ -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 list = dataStatsService.queryAgencyIcUserCategoryData(gridPids, formDTO.getDateId(), configIds); if(CollectionUtils.isNotEmpty(list)){