Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

4 years ago · 2dd9efcb11
1 changed files with 1 additions and 1 deletions
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml
@ -19,7 +19,7 @@
        WHERE
            del_flag = '0'
            AND UNIX_TIMESTAMP(CREATED_TIME) >= UNIX_TIMESTAMP(DATE_SUB(NOW(),INTERVAL 1 MONTH))
-            <if test="level != null and level.trim()!=''">
+            <if test="level != null and level.trim()!='' and level !='all'">
                and project_level = #{level}
            </if>
            <if test="ids != null">