From 7374233019e080009281b6f3029d7ac5bdf3bb0f Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 22 May 2020 19:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E8=BF=87=E6=BB=A4gridID=E4=B8=BA0=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05?=
 =?UTF-8?q?-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml    |  4 ++--
 .../src/main/resources/mapper/UserDao.xml        | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 2157611a2..d15ec3667 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -878,7 +878,7 @@
                 esua_epdc_user.epdc_user uu
                 LEFT JOIN (SELECT MIN( CREATED_TIME ) AS CREATED_TIME, USER_ID FROM esua_epdc_user.epdc_user_grid_relation  WHERE DEL_FLAG = '0'  GROUP BY USER_ID ) MINRELA  ON MINRELA.USER_ID = uu.ID
                 LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION  ON RELATION.USER_ID = MINRELA.USER_ID  AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
-                LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(uu.DEPT_ID,RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
+                LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(if(uu.DEPT_ID = 0,null,uu.DEPT_ID),RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
                 <include refid="joinCommunityStreet"></include>
 
                 LEFT JOIN (
@@ -960,7 +960,7 @@
         esua_epdc_user.epdc_user uu
         LEFT JOIN (SELECT MIN( CREATED_TIME ) AS CREATED_TIME, USER_ID FROM esua_epdc_user.epdc_user_grid_relation  WHERE DEL_FLAG = '0'  GROUP BY USER_ID ) MINRELA  ON MINRELA.USER_ID = uu.ID
         LEFT JOIN esua_epdc_user.epdc_user_grid_relation RELATION  ON RELATION.USER_ID = MINRELA.USER_ID  AND RELATION.DEL_FLAG = '0' AND MINRELA.CREATED_TIME = RELATION.CREATED_TIME
-        LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(uu.DEPT_ID,RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
+        LEFT JOIN esua_epdc_admin.sys_dept ad ON IFNULL(if(uu.DEPT_ID = 0,null,uu.DEPT_ID),RELATION.GRID_ID) = ad.ID AND ad.type_key = 'grid_party'
         <include refid="joinCommunityStreet"></include>
 
         LEFT JOIN (
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index d26f46085..df9458e88 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -702,7 +702,7 @@
         <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
         <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>
-        AND IFNULL(u.dept_id,RELATION.GRID_ID) IN
+        AND IFNULL(if(u.dept_id = 0 ,null,u.dept_id),RELATION.GRID_ID) IN
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
@@ -715,7 +715,7 @@
             OR find_in_set(#{communityId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
         </if>
         <if test="gridId != '' and gridId != null">
-            and (IFNULL(u.dept_id,RELATION.GRID_ID) = #{gridId}
+            and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
             OR find_in_set(#{gridId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
         </if>
         and HISTORY.AUTHENTICATED_TYPE='0' and HISTORY.AUTHENTICATED_FLAG = '2'
@@ -768,7 +768,7 @@
         <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
         <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>
-        AND IFNULL(u.dept_id,RELATION.GRID_ID) IN
+        AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
@@ -781,7 +781,7 @@
             OR find_in_set(#{communityId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
         </if>
         <if test="gridId != '' and gridId != null">
-            and (IFNULL(u.dept_id,RELATION.GRID_ID) = #{gridId}
+            and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
             OR find_in_set(#{gridId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
         </if>
         and HISTORY.id is null
@@ -835,7 +835,7 @@
         <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
         <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>
-        AND IFNULL(u.dept_id,RELATION.GRID_ID) IN
+        AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
@@ -848,7 +848,7 @@
             OR find_in_set(#{communityId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
         </if>
         <if test="gridId != '' and gridId != null">
-            and (IFNULL(u.dept_id,RELATION.GRID_ID) = #{gridId}
+            and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
             OR find_in_set(#{gridId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
         </if>
         and HISTORY.AUTHENTICATED_TYPE='0' and HISTORY.AUTHENTICATED_FLAG = '0'
@@ -938,7 +938,7 @@
         <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
         <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>
-        AND IFNULL(u.dept_id,RELATION.GRID_ID) IN
+        AND IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
@@ -951,7 +951,7 @@
             OR find_in_set(#{communityId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
         </if>
         <if test="gridId != '' and gridId != null">
-            and (IFNULL(u.dept_id,RELATION.GRID_ID) = #{gridId}
+            and (IFNULL(if(u.dept_id=0,null,u.dept_id),RELATION.GRID_ID) = #{gridId}
             OR find_in_set(#{gridId},IFNULL(u.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)))
         </if>
         and HISTORY.AUTHENTICATED_TYPE='1' and HISTORY.AUTHENTICATED_FLAG = '0'