From 546cb7d6feae0aec034e96283811ea698bb9f1e4 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 25 Mar 2022 15:14:37 +0800
Subject: [PATCH] =?UTF-8?q?grid=E7=BC=93=E5=AD=98=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerGridDao.xml            | 5 +++--
 1 file changed, 3 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 357c8cebdc..bfbf419b42 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
@@ -756,10 +756,11 @@
             cg.mobile,
             <!-- 网格没有经纬度时获取客户根组织下的 -->
             IFNULL(cg.longitude,ca.longitude) longitude,
-            IFNULL(cg.latitude,ca.latitude) latitude
+            IFNULL(cg.latitude,ca.latitude) latitude,
+            ca.organization_name
         FROM
             customer_grid cg
-        INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
+        INNER JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.customer_id = cg.customer_id)
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'