From 40d6c23b75586231f1fcca5d1b225fe5d1d06404 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 28 Apr 2022 09:31:17 +0800
Subject: [PATCH] =?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               | 4 ++--
 .../src/main/resources/mapper/IcNeighborHoodDao.xml           | 2 +-
 2 files changed, 3 insertions(+), 3 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 d051f8d595..5b44a11e95 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,8 +108,8 @@
             </if>
             AND a.DEL_FLAG = '0'
         </where>
-        ORDER BY CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
-        CONVERT(a.BUILDING_NAME USING gbk)
+        ORDER BY CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
+        CAST(a.BUILDING_NAME AS SIGNED),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 6fedffbbe1..f7cd4b251a 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,7 @@
             AND a.DEL_FLAG = '0'
 
         </where>
-        ORDER BY CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
+        ORDER BY CAST(a.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
     </select>
     <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select