diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 8e29ff2cec..9da7db0673 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -307,12 +307,21 @@ WHERE - score.del_flag = '0' + score.del_flag = '0' + AND score.MONTH_ID = #{monthId,jdbcType=VARCHAR} AND score.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} - AND score.PARENT_ID = #{agencyId,jdbcType=VARCHAR} - AND score.MONTH_ID = #{monthId,jdbcType=VARCHAR} + + + + AND org.PIDS like concat(#{agencyId},'%') + AND org.LEVEL = 'community' + + + AND score.PARENT_ID = #{agencyId,jdbcType=VARCHAR} + + AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}