【居民管理修改】-【未认证、已认证、待认证模糊搜索调整】-（王童）-2020/05/28

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>