From 3f927a1359b102c79d4c64f900f37deb115660f7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 2 Mar 2021 13:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=81=94=E7=B3=BB=E7=BE=A4?=
 =?UTF-8?q?=E4=BC=97=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3sql=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
index 0db5e467e1..2a5f09786e 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
@@ -29,7 +29,7 @@
         FROM
             screen_customer_agency sca
         LEFT JOIN screen_party_link_masses_data md
-        ON ( sca.agency_id = md.ORG_ID AND	md.del_flag = '0'  )
+        ON ( sca.agency_id = md.ORG_ID AND	md.del_flag = '0'  and md.org_type='agency')
         WHERE SCA.DEL_FLAG='0'
             AND sca.is_display = '1'
         <if test="agencyIdList != null and agencyIdList.size() > 0">
@@ -47,7 +47,7 @@
         FROM
             screen_customer_grid scg
         LEFT JOIN screen_party_link_masses_data md
-            ON ( scg.GRID_ID = md.ORG_ID AND md.del_flag = '0'  )
+            ON ( scg.GRID_ID = md.ORG_ID AND md.del_flag = '0' and md.org_type='grid' )
         WHERE scg.DEL_FLAG='0'
         <if test="agencyIdList != null and agencyIdList.size() > 0">
             AND scg.GRID_ID in