From e44bc020462803dce825dcbea91f81d6f22464ae Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 18 Jun 2020 14:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B3=E7=BB=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/stats/DimAgencyDao.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimAgencyDao.xml
index e39b5afb4b..c3f57496ca 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimAgencyDao.xml
@@ -38,14 +38,14 @@
     <select id="selectAllAgency" resultMap="treeMap">
         SELECT
             agency.ID AS agencyId,
-            agency.ORGANIZATION_NAME AS agencyName,
+            agency.AGENCY_NAME AS agencyName,
             grid.ID AS gridId,
             agency.CUSTOMER_ID,
-            angency.PID,
+            agency.PID,
             agency.LEVEL
         FROM
             dim_agency agency
-            LEFT JOIN dim_grid grid ON agency.ID = grid.PID
+            LEFT JOIN dim_grid grid ON agency.ID = grid.AGENCY_ID
             AND grid.DEL_FLAG = '0'
         WHERE
             agency.DEL_FLAG = '0'
@@ -58,14 +58,14 @@
     <select id="selectSubAgencyByPid" resultMap="treeMap" parameterType="string">
         SELECT
             agency.id AS agencyId,
-            agency.ORGANIZATION_NAME AS agencyName,-- agency.PID,agency.PIDS ,
+            agency.AGENCY_NAME AS agencyName,-- agency.PID,agency.PIDS ,
             grid.ID AS gridId, -- ,GRID_NAME
             agency.CUSTOMER_ID,
             agency.PID,
             agency.LEVEL
         FROM
             dim_agency agency
-            LEFT JOIN dim_grid grid ON agency.ID = grid.PID
+            LEFT JOIN dim_grid grid ON agency.ID = grid.AGENCY_ID
             AND grid.DEL_FLAG = '0'
         WHERE
             agency.DEL_FLAG = '0'
@@ -80,14 +80,14 @@
     <select id="selectTopAgency" resultMap="treeMap">
         SELECT
             agency.ID AS agencyId,
-            agency.ORGANIZATION_NAME AS agencyName,
+            agency.AGENCY_NAME AS agencyName,
             grid.ID AS gridId,
             agency.CUSTOMER_ID,
-            angency.PID,
+            agency.PID,
             agency.LEVEL
         FROM
             dim_agency agency
-            LEFT JOIN dim_grid grid ON agency.ID = grid.PID
+            LEFT JOIN dim_grid grid ON agency.ID = grid.AGENCY_ID
             AND grid.DEL_FLAG = '0'
         WHERE
             agency.DEL_FLAG = '0'