From a5edb2df6e99dc0d147c8e581599fdf3c8b5015b Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 3 Aug 2022 15:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index c74892593f..17d2ab1715 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -929,7 +929,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         }
         LambdaQueryWrapper<CustomerGridEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CustomerGridEntity::getPid, agencyId);
-        wrapper.last("ORDER BY CONVERT ( GRID_NAME USING gbk ) ASC,sort");
+        wrapper.last("ORDER BY sort,CONVERT ( GRID_NAME USING gbk ) desc");
         List<CustomerGridEntity> list = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();