From 1c87a9d0b87c091d64116c084dfb46e6c53dc255 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 23 Dec 2021 15:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E6=A0=B9=E7=BB=84=E7=BB=87=E4=B8=AD=E5=BF=83=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/CustomerAgencyDao.xml    | 36 +++----------------
 1 file changed, 4 insertions(+), 32 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 4e7660f651..8b89d3c966 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
@@ -341,22 +341,8 @@
             cg.id AS gridId,
             cg.GRID_NAME AS gridName,
             cg.CUSTOMER_ID AS customerId,
-            ( CASE WHEN ca.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.longitude
-                END
-            ) longitude,
-            ( CASE WHEN ca.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE ca.latitude
-                END
-            ) latitude
+            ca.longitude,
+            ca.latitude
         FROM
             customer_grid cg
         INNER JOIN customer_agency ca ON cg.PID = ca.ID
@@ -371,22 +357,8 @@
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
             agency.CUSTOMER_ID as customerId,
-            ( CASE WHEN agency.longitude is null THEN
-                ( SELECT longitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE agency.longitude
-                END
-            ) longitude,
-            ( CASE WHEN agency.latitude is null THEN
-                ( SELECT latitude FROM customer_agency
-                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
-                    ORDER BY pid ASC LIMIT 1
-                )
-                ELSE agency.latitude
-                END
-            ) latitude
+            agency.longitude,
+            agency.latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE