From 76b1f42824602cf0f99ae633c44b27dffb379ce9 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 20 May 2022 09:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=94=E5=BB=BA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D-=E7=AE=80=E8=A6=81=E4=BF=A1=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java | 6 ++++++
 .../src/main/resources/mapper/IcPartyUnitDao.xml            | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

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 8f2db1e2ad..aad04a4b53 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
@@ -600,8 +600,14 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
 
     @Override
     public PageData getListbrief(PartyUnitListbriefFormDTO form) {
+        Result<Map<String, String>> unitTypeMap = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.PARTY_UNIT_TYPE.getCode());
         PageHelper.startPage(form.getPageNo(), form.getPageSize());
         List<PartyUnitListbrieResultDTO> dto = baseDao.getListbrief(form, form.getCustomerId());
+
+        dto.forEach(item -> {
+            item.setType(unitTypeMap.getData().get(item.getType()));
+        });
+
         // 获取gridName
         /*for (PartyUnitListbrieResultDTO item : dto) {
             if (StringUtils.isNotEmpty(item.getGridId())) {
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
index 9a25ea4906..3067a3f65d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
@@ -86,8 +86,8 @@
 --             AND b.DEL_FLAG = '0'
         <where>
             a.DEL_FLAG = '0'
-            AND a.AGENCY_ID = #{form.agencyId}
             AND a.CUSTOMER_ID = #{customerId}
+            AND (AGENCY_ID = #{form.agencyId} OR PIDS LIKE concat( '%', #{form.agencyId}, '%' ))
 <!--            <if test="gridId != null and gridId != ''">-->
 <!--                AND b.GRID_ID = #{form.gridId}-->
 <!--            </if>-->