diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
index ee8caafc3e..d2c47a0922 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
@@ -27,25 +27,12 @@
             ca.level,
             ca.area_code,
             ca.parent_area_code,
-            ( 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
+            IFNULL(ca.longitude, cc.longitude) longitude,
+            IFNULL(ca.latitude, cc.latitude) latitude
         FROM
             customer_staff_agency csa
         INNER JOIN customer_agency ca ON csa.agency_id = ca.id
+        INNER JOIN customer_agency cc ON cc.pid = '0' AND ca.customer_id = cc.customer_id
         WHERE
             csa.del_flag = '0'
         AND ca.del_flag = '0'
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 be7125e80c..13629cef31 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
@@ -190,23 +190,10 @@
             ca.organization_name AS "agencyName",
             ca.pids AS "pids",
             ca.level level,
-	        ( 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
+	        IFNULL(ca.longitude, cc.longitude) longitude,
+            IFNULL(ca.latitude, cc.latitude) latitude
         FROM customer_agency ca
+        INNER JOIN customer_agency cc ON cc.pid = '0' AND ca.customer_id = cc.customer_id
         WHERE ca.del_flag = '0'
         AND ca.pids = #{subAgencyPids}
         ORDER BY ca.created_time DESC
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 a08a4f534c..4c34ea5bed 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
@@ -409,25 +409,11 @@
             ) agencyGridName,
             cg.grid_name gridName,
             <!-- 网格没有经纬度时获取客户根组织下的 -->
-            ( CASE WHEN cg.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 cg.longitude
-                END
-            ) longitude,
-            ( CASE WHEN cg.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 cg.latitude
-                END
-            ) latitude
+            IFNULL(cg.longitude, ca.longitude) longitude,
+            IFNULL(cg.latitude, ca.latitude) latitude
         FROM
             customer_grid cg
-        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'
@@ -758,25 +744,11 @@
             cg.contacts,
             cg.mobile,
             <!-- 网格没有经纬度时获取客户根组织下的 -->
-            ( CASE WHEN cg.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 cg.longitude
-                END
-            ) longitude,
-                ( CASE WHEN cg.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 cg.latitude
-                END
-            ) latitude
+            IFNULL(cg.longitude,ca.longitude) longitude,
+            IFNULL(cg.latitude,ca.latitude) latitude
         FROM
             customer_grid cg
-        INNER JOIN customer_agency ca ON cg.pid = ca.id
+        INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'