Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export

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>
 
     <!-- 查询个人信息 -->
@@ -801,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
@@ -810,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