From a84822f7453dd26f2049907ef907301224ece5cf Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 27 Apr 2022 16:51:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserImportServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 51074aac3e..5432d7cb44 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -73,7 +73,7 @@ import java.util.stream.Collectors;
 
 /**
  * @ClassName IcResiUserImportServiceImpl
- * @Description TODO
+ * @Description 居民信息导入 服务实现类
  * @Author wangxianzhang
  * @Date 2021/11/4 8:53 下午
  * @Version 1.0

From ce76dd0bb55b475674d05c590a72ec5480cc6875 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 27 Apr 2022 17:11:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcBuildingDao.xml              | 5 ++++-
 .../src/main/resources/mapper/IcNeighborHoodDao.xml          | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index 59ac9f2b24..1f4c188744 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -108,7 +108,10 @@
             </if>
             AND a.DEL_FLAG = '0'
         </where>
-        order by a.CREATED_TIME, a.BUILDING_NAME
+#         order by a.CREATED_TIME, a.BUILDING_NAME
+        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
+        ORDER BY CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
+        CONVERT(a.BUILDING_NAME USING gbk)
     </select>
     <select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
         select
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index 7efa9105e5..660770fe2a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -100,7 +100,8 @@
             AND a.DEL_FLAG = '0'
 
         </where>
-        ORDER BY a.CREATED_TIME
+#         ORDER BY a.CREATED_TIME
+        ORDER BY CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
     </select>
     <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select