Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event

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<HashMap<String, List<ResiEventNpcResultDTO>>> listNpc(@RequestBody ResiEventNpcListFormDTO input) {
         ValidatorUtils.validateEntity(input);
         String customerId = input.getCustomerId();
-        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId);
+        List<ResiEventNpcResultDTO> npcs = resiEventService.listNpcByGrid(customerId, loginUserUtil.getLoginUserId());
 
         HashMap<String, List<ResiEventNpcResultDTO>> wrapper = new HashMap<>();
         wrapper.put("reportTargets", npcs);

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<ResiEventNpcResultDTO> listNpcByGrid(String customerId);
+    List<ResiEventNpcResultDTO> listNpcByGrid(String customerId, String excludeUserId);
 
     /**
      * @Description 查询上报目标列表

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<ResiEventNpcResultDTO> listNpcByGrid(String customerId) {
+    public List<ResiEventNpcResultDTO> listNpcByGrid(String customerId, String excludeUserId) {
 
         // 查询网格所属的组织信息
         //Result<GridInfoResultDTO> gridInfoResult = govOrgOpenFeignClient.queryGridInfo(customerId);
@@ -59,16 +59,18 @@ public class ResiEventServiceImpl implements ResiEventService, ResultDataResolve
 
         List<ResiEventNpcResultDTO> 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);
+                    }
                 }
         );