From c6b32326fd2b35e5a784f7134d8738221d685eaf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 6 May 2022 10:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=EF=BC=8C=E6=88=BF=E5=B1=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=80=92=E5=BA=8F=E6=AD=A3?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcBuildingDao.xml              | 5 +++--
 .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml  | 5 +++--
 2 files changed, 6 insertions(+), 4 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 482deeccea..2cc2fcd73f 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
@@ -122,8 +122,9 @@
             AND a.DEL_FLAG = '0'
         </where>
         ORDER BY
-        <if test='sortType == "asc" '>a.sort,</if>
-        <if test='sortType == "desc" '>a.sort DESC,</if>
+        <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>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 514b0629ac..49472d0dc7 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -159,8 +159,9 @@
         </where>
        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
         ORDER BY
-        <if test='sortType == "asc" '>a.sort,</if>
-        <if test='sortType == "desc" '>a.sort DESC,</if>
+        <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>
         CONVERT(c.NEIGHBOR_HOOD_NAME using gbk),
         CONVERT(b.BUILDING_NAME USING gbk),
         CONVERT(d.UNIT_NAME USING gbk),