From 76195208f699d2d2b095dddfa99d4b704e16d445 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Tue, 9 Aug 2022 08:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 4384ff1d34..ad222f32ea 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
@@ -497,7 +497,9 @@
                 SELECT
                     a.id AS grid_id,
                     a.customer_id,
-                    concat( agency.fullname, '-', a.grid_name ) AS gridName
+                    concat( agency.fullname, '-', a.grid_name ) AS gridName,
+                    a.sort as sort,
+                    agency.fullname as fullName
                 FROM
                     CUSTOMER_GRID a
                 LEFT JOIN (
@@ -521,7 +523,7 @@
                     and a.ABANDON_FLAG='0'
                     AND a.customer_id = #{customerId}
             ) AS c
-         ORDER BY CONVERT ( gridName USING gbk ) ASC
+         ORDER BY fullName,c.sort,CONVERT ( gridName USING gbk ) ASC
         LIMIT #{pageNo}, #{pageSize}
     </select>