From bf48aef8b676ca589df0c1ca67475912f6b96bed Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 6 May 2022 16:38:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?listresi=E6=8E=92=E5=BA=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcResiUserDao.xml     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 4ddfdb46bd..1bff30a5ca 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -165,7 +165,12 @@
                 ${groupTableName}.ID
             </foreach>
         </if>
-        order by ic_resi_user.CREATED_TIME desc,ic_resi_user.id desc
+        ORDER BY
+        IC_RESI_USER.GRID_ID ASC,
+        IC_RESI_USER.VILLAGE_ID ASC,
+        IC_RESI_USER.BUILD_ID ASC,
+        IC_RESI_USER.UNIT_ID ASC,
+        IC_RESI_USER.HOME_ID ASC
     </select>
 
     <update id="updateToDel" parameterType="java.lang.String">
@@ -203,7 +208,11 @@
                 ${groupTableName}.ID
             </foreach>
         </if>
-        order by ic_resi_user.CREATED_TIME desc,ic_resi_user.id desc
+        order by IC_RESI_USER.GRID_ID ASC,
+        IC_RESI_USER.VILLAGE_ID ASC,
+        IC_RESI_USER.BUILD_ID ASC,
+        IC_RESI_USER.UNIT_ID ASC,
+        IC_RESI_USER.HOME_ID ASC
     </select>
 
     <!-- 查询个人信息 -->

From ac71a67c310cbb3ed5199afe304d82e88070efaf Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 6 May 2022 17:01:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcResiUserDao.xml                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 1bff30a5ca..2f3b12f380 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -810,6 +810,7 @@
             <if test="idCard != null and idCard != ''">
             AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' )
             </if>
+            ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk)
             ) t
             WHERE
                 1=1
@@ -819,7 +820,7 @@
             <if test="natCount != null">
             AND natCount = #{natCount}
             </if>
-            ORDER BY `NAME`
+
     </select>
     <select id="natList" resultType="com.epmet.dto.result.EpidemicPreventionResultDTO">
         SELECT * FROM