From 4abf15bc03198f565b9b44d7e5b5257ebed021e3 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 27 Jul 2020 16:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E9=9C=80=E8=A6=81=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
index 5a96dc3..0f75445 100644
--- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
+++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
@@ -86,18 +86,18 @@
         <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
         <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
         <if test="partyFlag != '' and partyFlag != null">and u.party_flag = #{partyFlag}</if>
-        <if test="streetId != '' and streetId != null">
-            AND (find_in_set(#{streetId},ug.PARENT_DEPT_IDS)
-            OR find_in_set(#{streetId},ug.ALL_DEPT_IDS))
-        </if>
-        <if test="communityId != '' and communityId != null">
-            AND (find_in_set(#{communityId},ug.PARENT_DEPT_IDS)
-            OR find_in_set(#{communityId},ug.ALL_DEPT_IDS))
-        </if>
-        <if test="gridId != '' and gridId != null">
-            and (ug.grid_id = #{gridId}
-            OR find_in_set(#{gridId},ug.ALL_DEPT_IDS))
-        </if>
+<!--        <if test="streetId != '' and streetId != null">-->
+<!--            AND (find_in_set(#{streetId},ug.PARENT_DEPT_IDS)-->
+<!--            OR find_in_set(#{streetId},ug.ALL_DEPT_IDS))-->
+<!--        </if>-->
+<!--        <if test="communityId != '' and communityId != null">-->
+<!--            AND (find_in_set(#{communityId},ug.PARENT_DEPT_IDS)-->
+<!--            OR find_in_set(#{communityId},ug.ALL_DEPT_IDS))-->
+<!--        </if>-->
+<!--        <if test="gridId != '' and gridId != null">-->
+<!--            and (ug.grid_id = #{gridId}-->
+<!--            OR find_in_set(#{gridId},ug.ALL_DEPT_IDS))-->
+<!--        </if>-->
         GROUP BY
         u.ID
         ORDER BY