From 074b6173f26d8f07158b39687756f5d89fc49a32 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 22 May 2020 18:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E3=80=90sql=E4=BF=AE=E6=94=B9=E3=80=91-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-05-22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 d80feaae5..d26f46085 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
@@ -669,7 +669,7 @@
         u.ADDRESS,
         STATE,
         PARTY_FLAG,
-        RELATION.ALL_DEPT_NAMES,
+        IFNULL(u.ALL_DEPT_NAMES,RELATION.ALL_DEPT_NAMES) ALL_DEPT_NAMES,
         u.FACE_IMG
         FROM
         epdc_user u
@@ -735,7 +735,7 @@
         u.ADDRESS,
         STATE,
         PARTY_FLAG,
-        RELATION.ALL_DEPT_NAMES,
+        IFNULL(u.ALL_DEPT_NAMES,RELATION.ALL_DEPT_NAMES) ALL_DEPT_NAMES,
         u.FACE_IMG
         FROM
         epdc_user u
@@ -802,7 +802,7 @@
         u.ADDRESS,
         STATE,
         PARTY_FLAG,
-        RELATION.ALL_DEPT_NAMES,
+        IFNULL(u.ALL_DEPT_NAMES,RELATION.ALL_DEPT_NAMES) ALL_DEPT_NAMES,
         u.FACE_IMG
         FROM
         epdc_user u
@@ -905,7 +905,7 @@
         u.ADDRESS,
         STATE,
         PARTY_FLAG,
-        RELATION.ALL_DEPT_NAMES,
+        IFNULL(u.ALL_DEPT_NAMES,RELATION.ALL_DEPT_NAMES) ALL_DEPT_NAMES,
         u.FACE_IMG
         FROM
         epdc_user u