修改社群成员列表排序方式

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">

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>