From e7fcda6ff8d0816448f8aa200d4276741ace8606 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 18 May 2022 16:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D-=E7=AE=80?=
 =?UTF-8?q?=E8=A6=81=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?gridName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/PartyUnitListbrieResultDTO.java | 5 +++++
 .../com/epmet/service/impl/IcPartyUnitServiceImpl.java   | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java
index 56a7524ae7..e4eef93ec1 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/PartyUnitListbrieResultDTO.java
@@ -23,6 +23,11 @@ public class PartyUnitListbrieResultDTO implements Serializable {
      */
     private String gridName;
 
+    /**
+     * 所属网格id
+     */
+    private String gridId;
+
     /**
      * 分类
      */
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
index 429652da58..81afd27ab7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
@@ -602,6 +602,15 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
     public PageData getListbrief(PartyUnitListbriefFormDTO form, TokenDto tokenDto) {
         PageHelper.startPage(form.getPageNo(), form.getPageSize());
         List<PartyUnitListbrieResultDTO> dto = baseDao.getListbrief(form, tokenDto.getCustomerId());
+        // 获取gridName
+        for (PartyUnitListbrieResultDTO item:dto) {
+            if (StringUtils.isNotEmpty(item.getGridId())) {
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if (null != gridInfo) {
+                    item.setGridName(gridInfo.getGridName());
+                }
+            }
+        }
         PageInfo<PartyUnitListbrieResultDTO> info = new PageInfo<>(dto);
         return new PageData<>(dto, info.getTotal());
     }