From b7ff4d20f070bf2a30e3cbae5ddeba4cc2ed1803 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 11 May 2022 13:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AF=BC=E5=87=BA=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcBuildingDao.xml             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 7387a73354..41332642a7 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
@@ -169,7 +169,11 @@
                 AND a.DEL_FLAG = #{building.delFlag}
             </if>
         </where>
-        order by a.CREATED_TIME, a.BUILDING_NAME
+        <if test='sortType == null '>a.sort,</if>
+        <if test='sortType != null and sortType == "asc" '>a.sort,</if>
+        <if test='sortType != null and sortType == "desc" '>a.sort DESC,</if>
+        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="selectAgencyChildrenList" resultType="com.epmet.entity.CustomerAgencyEntity">