From 9fa25450ede3bd89dd73d2446920a0455fec87c2 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 27 Jul 2020 15:41:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=96=B9=E5=BC=8F=20=20=E8=AE=A4=E8=AF=81=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/controller/UserController.java   |  9 +++++++++
 .../src/main/resources/mapper/UserDao.xml            | 12 ++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

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 1b1b695..9eadfda 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
@@ -55,6 +55,15 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    /**
+     *
+     * 功能描述: 未认证居民列表
+     *
+     * @params [params]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.UserDTO>>
+     * @author zhy
+     * @date 2020/7/27 15:18
+     */
     @GetMapping("page")
     @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
     public Result<PageData<UserDTO>> page(@RequestParam Map<String, Object> params) {
diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
index 6859966..92ba8e3 100644
--- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
+++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml
@@ -59,6 +59,7 @@
             LIMIT 1
     </select>
     <select id="selectListUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
+        SELECT * FROM (
         SELECT
         u.id,
         u.REAL_NAME,
@@ -72,7 +73,8 @@
         STATE,
         PARTY_FLAG,
         ug.ALL_DEPT_NAMES,
-        u.FACE_IMG
+        u.FACE_IMG,
+        u.WX_OPEN_ID
         FROM
         epdc_user u
         LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
@@ -98,10 +100,12 @@
             and (ug.grid_id = #{gridId}
             OR find_in_set(#{gridId},ug.ALL_DEPT_IDS))
         </if>
-        GROUP BY
-        u.ID
         ORDER BY
-        u.register_time desc
+        u.register_time ASC
+        ) t
+        GROUP BY
+        t.WX_OPEN_ID
+        ORDER BY t.register_time DESC
     </select>
     <select id="selectListOfWaitPartyUserDto" resultType="com.elink.esua.epdc.dto.UserDTO">
         SELECT