From f7401329843376e4a1665d3fa06f625214283e36 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 19 May 2022 17:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/PartyUnitListbriefFormDTO.java   |  2 +-
 .../result/PartyUnitListbrieResultDTO.java    |  4 ++--
 .../service/impl/IcPartyUnitServiceImpl.java  |  4 ++--
 .../main/resources/mapper/IcPartyUnitDao.xml  | 22 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java
index a59a6515b3..899ba36866 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyUnitListbriefFormDTO.java
@@ -31,7 +31,7 @@ public class PartyUnitListbriefFormDTO implements Serializable {
     /**
      * 网格id
      */
-    private String gridId;
+//    private String gridId;
 
     /**
      * 组织id
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 e4eef93ec1..eadc99ca2a 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
@@ -21,12 +21,12 @@ public class PartyUnitListbrieResultDTO implements Serializable {
     /**
      * 所属网格
      */
-    private String gridName;
+//    private String gridName;
 
     /**
      * 所属网格id
      */
-    private String gridId;
+//    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 5276e1352d..8f2db1e2ad 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
@@ -603,14 +603,14 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
         PageHelper.startPage(form.getPageNo(), form.getPageSize());
         List<PartyUnitListbrieResultDTO> dto = baseDao.getListbrief(form, form.getCustomerId());
         // 获取gridName
-        for (PartyUnitListbrieResultDTO item : dto) {
+        /*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());
     }
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 c898ec9f5d..9a25ea4906 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
@@ -76,34 +76,34 @@
     <select id="getListbrief" resultType="com.epmet.dto.result.PartyUnitListbrieResultDTO">
         SELECT
             a.id,
-            b.GRID_ID,
+--             b.GRID_ID,
             a.UNIT_NAME,
             a.type,
             a.SERVICE_MATTER
         FROM
             ic_party_unit a
-            LEFT JOIN ic_party_activity b ON a.id = b.UNIT_ID
-            AND b.DEL_FLAG = '0'
+--             LEFT JOIN ic_party_activity b ON a.id = b.UNIT_ID
+--             AND b.DEL_FLAG = '0'
         <where>
             a.DEL_FLAG = '0'
             AND a.AGENCY_ID = #{form.agencyId}
             AND a.CUSTOMER_ID = #{customerId}
-            <if test="gridId != null and gridId != ''">
-                AND b.GRID_ID = #{form.gridId}
-            </if>
-            <if test="unitName != null and unitName != ''">
+<!--            <if test="gridId != null and gridId != ''">-->
+<!--                AND b.GRID_ID = #{form.gridId}-->
+<!--            </if>-->
+            <if test="form.unitName != null and form.unitName != ''">
                 AND a.UNIT_NAME = #{form.unitName}
             </if>
-            <if test="serviceMatter != null and serviceMatter != ''">
+            <if test="form.serviceMatter != null and form.serviceMatter != ''">
                 AND a.SERVICE_MATTER = #{form.serviceMatter}
             </if>
-            <if test="type != null and type != ''">
+            <if test="form.type != null and form.type != ''">
                 AND a.type = #{form.type}
             </if>
-            <if test="contact != null and contact != ''">
+            <if test="form.contact != null and form.contact != ''">
                 AND a.CONTACT = #{form.contact}
             </if>
-            <if test="contactMobile != null and contactMobile != ''">
+            <if test="form.contactMobile != null and form.contactMobile != ''">
                 AND a.CONTACT_MOBILE = #{form.contactMobile}
             </if>
         </where>