居民防疫信息排序

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