From 362467c18469b0c5a858e884c84b658f8b75382b Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 11 May 2022 13:44:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/V0.0.44__add_death_date.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql
index d7d60b7cd2..4db8d747fb 100644
--- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.44__add_death_date.sql
@@ -1 +1 @@
-alter table pli_change_relocation add COLUMN `DEATH_DATE` date DEFAULT NULL COMMENT '死亡时间';
+alter table pli_change_death add COLUMN `DEATH_DATE` date DEFAULT NULL COMMENT '死亡时间';

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 2/3] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=92=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">

From c350e1ae033157087e2a7435d86306ee3ce2aa8a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 11 May 2022 13:59:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8E=92=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               | 4 +---
 1 file changed, 1 insertion(+), 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 41332642a7..d2b083be94 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,9 +169,7 @@
                 AND a.DEL_FLAG = #{building.delFlag}
             </if>
         </where>
-        <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>
+        ORDER BY a.sort,
         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>