From 714375e75fcbf3a33d85207bff52838c08f06f93 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 1 Jun 2021 10:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=93=E5=AD=98=E4=B8=ADus?=
 =?UTF-8?q?er=E7=9A=84showname=E5=92=8C=E7=BB=84=E5=91=98member=E4=B8=ADus?=
 =?UTF-8?q?ershowname=E6=B2=A1=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerGridDao.xml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 15c14dbd93..2036e76fa6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -338,7 +338,7 @@
             LEFT JOIN customer_agency ca ON ca.id = cg.pid
         WHERE
             cg.id = #{gridId}
-            AND cg.del_flag = 0
+            <!-- AND cg.del_flag = 0 --><!-- 网格被删除时，首次在该网格注册的居民就找不到了所属网格，暂时关闭这个查询条件，避免缓存中user的showname和组成员member的usershowname出现空值 -->
     </select>
 
     <select id="selectGridList" resultType="com.epmet.dto.result.GridListResultDTO">