From 8d92d5ed5c516243c678e9c876fda280652446c5 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 28 May 2020 11:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91-=E3=80=90=E6=9C=AA=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E3=80=81=E5=B7=B2=E8=AE=A4=E8=AF=81=E3=80=81=E5=BE=85?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05?=
 =?UTF-8?q?/28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 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 385948e23..81d88703c 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
@@ -643,10 +643,10 @@
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
-        <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
-        <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>
+        <if test="realName != '' and realName != null">and USER.real_name like '%${realName}%'</if>
+        <if test="nickname != '' and nickname != null">and USER.NICKNAME like '%${nickname}%'</if>
+        <if test="mobile != '' and mobile != null">and USER.mobile like '%${mobile}%'</if>
+        <if test="identityNo != '' and identityNo != null">and USER.identity_no like '%${identityNo}%'</if>
         <if test="streetId != '' and streetId != null">
             AND (find_in_set(#{streetId},USER.PARENT_DEPT_IDS)
             OR find_in_set(#{streetId},USER.ALL_DEPT_IDS))
@@ -754,10 +754,10 @@
         <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
             #{deptId}
         </foreach>
-        <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
-        <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>
+        <if test="realName != '' and realName != null">and user.real_name like '%${realName}%'</if>
+        <if test="nickname != '' and nickname != null">and user.NICKNAME like '%${nickname}%'</if>
+        <if test="mobile != '' and mobile != null">and user.mobile like '%${mobile}%'</if>
+        <if test="identityNo != '' and identityNo != null">and user.identity_no like '%${identityNo}%'</if>
 
         <if test="streetId != '' and streetId != null">
             AND (find_in_set(#{streetId},user.PARENT_DEPT_IDS)
@@ -848,10 +848,10 @@
             #{deptId}
         </foreach>
         and user.AUTHENTICATED_TYPE is null
-        <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
-        <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>
+        <if test="realName != '' and realName != null">and user.real_name like '%${realName}%'</if>
+        <if test="nickname != '' and nickname != null">and user.NICKNAME like '%${nickname}%'</if>
+        <if test="mobile != '' and mobile != null">and user.mobile like '%${mobile}%'</if>
+        <if test="identityNo != '' and identityNo != null">and user.identity_no like '%${identityNo}%'</if>
 
         <if test="streetId != '' and streetId != null">
             AND (find_in_set(#{streetId},user.PARENT_DEPT_IDS)
@@ -1249,7 +1249,7 @@
         epdc_user uu
         where  uu.DEL_FLAG = '0'
         <if test="startTime != '' and endTime != ''">and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if>
-        <if test="realName != '' and realName != null">and uu.real_name uu '%${realName}%'</if>
+        <if test="realName != '' and realName != null">and uu.real_name like '%${realName}%'</if>
         <if test="nickname != '' and nickname != null">and uu.NICKNAME like '%${nickname}%'</if>
         <if test="mobile != '' and mobile != null">and uu.mobile like '%${mobile}%'</if>
         <if test="identityNo != '' and identityNo != null">and uu.identity_no like '%${identityNo}%'</if>