From 7047e859247bcc39e53fe6339fcd2b5ab8508102 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 4 Aug 2022 10:45:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=AE=A3=E4=BC=A0-=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8-=E6=96=B0=E5=A2=9E-=E5=8F=91=E5=B8=83=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=20=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerGridDao.xml             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index 9aa5f2359d..918a0d6ba6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -420,6 +420,8 @@
         WHERE del_flag = '0'
          and ABANDON_FLAG='0'
          AND pid = #{agencyId}
+        order by
+            sort,grid_name
     </select>
 
     <select id="selectAgencyGridMsgList" resultType="com.epmet.dto.result.AgencyGridList">
@@ -443,6 +445,8 @@
         AND ca.del_flag = '0'
         and cg.ABANDON_FLAG='0'
         AND cg.pid = #{agencyId}
+        order by
+            ca.sort,ca.grid_name
     </select>
 
     <!-- 单客户-根据城市地区码前四位匹配到城市下所有网格 -->