diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
index 9eadfda..c0bbdbd 100644
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -65,7 +65,7 @@ public class UserController {
      * @date 2020/7/27 15:18
      */
     @GetMapping("page")
-    @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+//    @DataFilter(tableAlias = "temp", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
     public Result<PageData<UserDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<UserDTO> page = userService.page(params);
         return new Result<PageData<UserDTO>>().ok(page);
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java
index e33a5d1..2373c48 100644
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java
@@ -100,6 +100,16 @@ public interface UserDao extends BaseDao<UserEntity> {
      */
     List<UserDTO> selectListUserDto(Map<String, Object> params);
 
+    /**
+     * 查询用户列表NEW
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/10/25 16:13
+     */
+    List<UserDTO> selectListUserDtos(Map<String, Object> params);
+
     /**
      * 待认证党员
      *
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index e2cf403..7e9f781 100644
--- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -138,7 +138,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     @DataSource(value = DataSourceNames.FIRST)
     public PageData<UserDTO> page(Map<String, Object> params) {
-        String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
+        String[] paramKeys = new String[]{"deptId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
         if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
             List<UserDTO> userDtoList = Lists.newArrayList();
             return new PageData<>(userDtoList, NumConstant.ZERO);
@@ -146,7 +146,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         this.verifyParams(params);
         // 查询当前用户所具有的的数据权限
         IPage<UserDTO> iPage = this.getPage(params);
-        List<UserDTO> userDtoList = this.baseDao.selectListUserDto(params);
+        List<UserDTO> userDtoList = this.baseDao.selectListUserDtos(params);
         return new PageData<>(userDtoList, iPage.getTotal());
     }
 
diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
index ab4bce0..b9f9a3d 100644
--- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
+++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
@@ -109,6 +109,53 @@
             OR find_in_set(#{gridId},t.ALL_DEPT_IDS))
         </if>
     </select>
+    <select id="selectListUserDtos" resultType="com.elink.esua.epdc.dto.UserDTO">
+        SELECT *
+FROM (
+         SELECT *
+         FROM (
+                  SELECT t.*,
+                         ug.ALL_DEPT_NAMES,
+                         ug.CREATED_TIME,
+                         ug.GRID_ID,
+                         ug.ALL_DEPT_IDS
+                  FROM (
+                           SELECT u.id,
+                                  u.NICKNAME,
+                                  u.MOBILE,
+                                  u.REGISTER_TIME,
+                                  u.UPDATED_TIME,
+                                  u.ADDRESS,
+                                  u.STATE,
+                                  u.PARTY_FLAG,
+                                  u.FACE_IMG
+                           FROM epdc_user u
+                           WHERE u.del_flag = '0'
+                             AND (
+                                   u.IDENTITY_NO IS NULL
+                                   OR u.IDENTITY_NO = ''
+                               )
+                             AND u.state = 0
+                             AND u.party_flag = 0
+        <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>
+        <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="partyFlag != '' and partyFlag != null">and u.party_flag = #{partyFlag}</if>
+                       ) t
+                           INNER JOIN epdc_user_grid_relation ug ON t.ID = ug.USER_ID
+                      AND ug.DEL_FLAG = '0'
+                  ORDER BY ug.CREATED_TIME ASC,
+                           t.REGISTER_TIME DESC
+              ) temp
+              WHERE 1=1
+         GROUP BY temp.id
+     ) t2
+WHERE 1 = 1
+        <if test="deptId != '' and deptId != null">and t2.ALL_DEPT_IDS LIKE '%${deptId}%'</if>
+    </select>
     <select id="selectListOfWaitPartyUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
         SELECT
         u.id,