Merge remote-tracking branch 'origin/dev'

5 years ago · 0073c368f7
1 changed files with 1 additions and 0 deletions
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@ -32,6 +32,7 @@
            AND ORG_ID = #{agencyId}
            AND TYPE = #{category}
            AND MONTH_ID <![CDATA[ >= ]]> #{bottomMonthId}
+            AND MEET_CATEGORY_NAME IS NOT NULL
        ORDER BY
            MONTH_ID DESC ,
            MEET_CATEGORY_NAME