Merge branch 'dev_screen_data_2.0' into dev_temp

5 years ago · d003ef8307
1 changed files with 1 additions and 0 deletions
--- 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
@ -205,6 +205,7 @@
        FROM
            screen_index_data_monthly dm
        INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id
+        AND dm.month_id = rd.month_id
        WHERE
            dm.del_flag = '0'
        AND rd.del_flag = '0'