From c3c60d039eff5c9d0d80b7a604043b560cfe497c Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 9 Aug 2021 15:24:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=8A=A5=E4=BA=8B-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=A6=82=E6=9E=9C=E6=98=AF=E4=BA=BA=E5=A4=A7?= =?UTF-8?q?=E4=BB=A3=E8=A1=A8=E5=88=99=E4=B8=8D=E5=88=97=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ResiEventController.java | 6 ++++- .../com/epmet/service/ResiEventService.java | 2 +- .../service/impl/ResiEventServiceImpl.java | 24 ++++++++++--------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java index 57d06b8a0b..3328277513 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.ResiEventNpcListFormDTO; @@ -30,6 +31,9 @@ public class ResiEventController { @Autowired private ResiEventService resiEventService; + @Autowired + private LoginUserUtil loginUserUtil; + /** * @return * @Description 查询人大代表列表(客户下的) @@ -40,7 +44,7 @@ public class ResiEventController { public Result>> listNpc(@RequestBody ResiEventNpcListFormDTO input) { ValidatorUtils.validateEntity(input); String customerId = input.getCustomerId(); - List npcs = resiEventService.listNpcByGrid(customerId); + List npcs = resiEventService.listNpcByGrid(customerId, loginUserUtil.getLoginUserId()); HashMap> wrapper = new HashMap<>(); wrapper.put("reportTargets", npcs); diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java index 85432f2a18..7b26a10ad5 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ResiEventService.java @@ -18,7 +18,7 @@ public interface ResiEventService { * @author wxz * @date 2021.08.03 09:29 */ - List listNpcByGrid(String customerId); + List listNpcByGrid(String customerId, String excludeUserId); /** * @Description 查询上报目标列表 diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index b81eb0f47e..bd6a1c4376 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -36,7 +36,7 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override - public List listNpcByGrid(String customerId) { + public List listNpcByGrid(String customerId, String excludeUserId) { // 查询网格所属的组织信息 //Result gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId); @@ -59,16 +59,18 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve List npcResultList = new ArrayList<>(); npcData.stream().forEach(npc -> { - OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId()); - ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO( - npc.getUserId(), - npc.getGridId(), - "人大代表-".concat(npc.getRealName()), - npc.getRealName(), - npc.getHeadImgUrl(), - gridInfo != null ? gridInfo.getAgencyId() : null, - gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null); - npcResultList.add(resiEventNpcInfo); + if (StringUtils.isBlank(excludeUserId) || !npc.getUserId().equals(excludeUserId)) { + OrgInfoResultDTO gridInfo = npcGridInfoMap.get(npc.getGridId()); + ResiEventNpcResultDTO resiEventNpcInfo = new ResiEventNpcResultDTO( + npc.getUserId(), + npc.getGridId(), + "人大代表-".concat(npc.getRealName()), + npc.getRealName(), + npc.getHeadImgUrl(), + gridInfo != null ? gridInfo.getAgencyId() : null, + gridInfo != null ? gridInfo.getPids().concat(":").concat(gridInfo.getAgencyId()) : null); + npcResultList.add(resiEventNpcInfo); + } } );