From 2712465d461cdaac470bf64aaaf79400b4578565 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 7 Nov 2019 16:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BE=E7=BE=A4=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/group/UserGroupDao.xml    | 18 +++++++++++++++++-
 .../src/main/resources/mapper/UserDao.xml      |  1 +
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
index 14d2cb69a..8e34bcb41 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
@@ -27,7 +27,23 @@
     </select>
 
     <select id="selectListOfGroupUsersByState" resultType="com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO">
-        SELECT ID, NICKNAME, USER_AVATAR, LORD_FLAG, CREATED_TIME FROM epdc_user_group WHERE DEL_FLAG = '0' AND STATE = #{state} AND GROUP_ID = #{groupId}
+        SELECT
+            ID,
+            NICKNAME,
+            USER_AVATAR,
+            LORD_FLAG,
+            CREATED_TIME
+        FROM
+            epdc_user_group
+        WHERE
+            DEL_FLAG = '0'
+            AND STATE = #{state}
+            AND GROUP_ID = #{groupId}
+        ORDER BY
+        <if test="state == 10">
+            CONVERT(NICKNAME USING gbk) ASC,
+        </if>
+         ASC CREATED_TIME DESC
     </select>
 
     <select id="selectOneOfLordByGroupId" resultType="com.elink.esua.epdc.dto.group.UserGroupDTO">
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 e2637be97..4655707b2 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
@@ -87,6 +87,7 @@
                 and LAST_NAME like concat('%', #{lastName}, '%')
             </if>
         ORDER BY
+            CONVERT(NICKNAME USING gbk) ASC,
             REGISTER_TIME
     </select>