From ddb23776aae34cc145d7a53b9e512dd122895572 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 4 Aug 2022 15:44:01 +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=E4=BF=AE=E6=94=B9=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/CustomerAgencyDao.xml      | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index e0242cf79a..2fc9e13747 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -371,6 +371,7 @@
         WHERE
             cg.DEL_FLAG = '0'
             AND cg.PID =#{agencyId}
+        order by cg.sort
     </select>
 
     <select id="selectSubAgencyByPid" resultMap="treeMap">
@@ -715,14 +716,6 @@
             agency.CUSTOMER_ID as customerId,
             agency.longitude,
             agency.latitude,
-        CASE
-            WHEN LOCATE( '一', ORGANIZATION_NAME ) = 1 THEN
-                1
-            WHEN LOCATE( '二', ORGANIZATION_NAME ) = 1 THEN
-                2
-            WHEN LOCATE( '三', ORGANIZATION_NAME ) = 1 THEN
-                3
-        END
         FROM
             CUSTOMER_AGENCY agency
         WHERE