From a0788727c87a032257b98df1af5ed598e2da9e99 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 27 Jun 2022 10:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E5=8F=96=E6=A0=B9=E7=BB=84=E7=BB=87=E7=9A=84=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e428bc42c6..7e2da08f95 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 @@ -421,7 +421,7 @@ SELECT cg.id gridId, CONCAT( - ca.organization_name, + cu.organization_name, "-", cg.grid_name ) agencyGridName, @@ -431,6 +431,7 @@ IFNULL(cg.latitude, ca.latitude) latitude FROM customer_grid cg + INNER JOIN customer_agency cu ON cu.id = cg.pid AND cu.customer_id = cg.customer_id INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id WHERE cg.del_flag = '0'