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..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 @@ -165,7 +165,12 @@ ${groupTableName}.ID - 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 @@ -203,7 +208,11 @@ ${groupTableName}.ID - 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 @@ -801,6 +810,7 @@ AND a.ID_CARD LIKE concat( '%', #{idCard}, '%' ) + ORDER BY GRID_ID,VILLAGE_ID,BUILD_ID,UNIT_ID,HOME_ID, convert(NAME using gbk) ) t WHERE 1=1 @@ -810,7 +820,7 @@ AND natCount = #{natCount} - ORDER BY `NAME` +