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' @@ -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' AND scg.GRID_ID in