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 fe3722702..129ecfcd5 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
@@ -119,7 +119,6 @@
         u.ALL_DEPT_NAMES
         FROM
         epdc_user u
-        LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
         where
         u.del_flag = '0'
         and u.IDENTITY_NO is not null
@@ -129,19 +128,16 @@
         <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
         <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</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))
+            AND (find_in_set(#{streetId},u.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},u.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))
+            AND (find_in_set(#{communityId},u.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},u.ALL_DEPT_IDS))
         </if>
         <if test="gridId != '' and gridId != null">
-            and (ug.grid_id = #{gridId}
-            OR find_in_set(#{gridId},ug.ALL_DEPT_IDS))
+            and find_in_set(#{gridId},u.ALL_DEPT_IDS)
         </if>
-        GROUP BY
-        u.ID
         ORDER BY
         u.register_time desc
     </select>
@@ -475,6 +471,7 @@
         epdc_user u
         where
         u.del_flag = '0'
+        and (u.IDENTITY_NO is null or u.IDENTITY_NO = '')
         <if test="startTime != '' and endTime != ''">and u.CREATED_TIME between #{startTime} and #{endTime}</if>
         <if test="state != '' and state != null">and u.state = #{state}</if>
         <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>