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

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -74,9 +74,10 @@
                   )
           <if test="existsStatus == true">
               AND cd.EPMET_CATEGORY_CODE IS NOT NULL
+              AND cd.EPMET_CATEGORY_CODE != ''
           </if>
           <if test="existsStatus == false">
-              AND cd.EPMET_CATEGORY_CODE IS NULL
+              AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
           </if>
           AND od.pid = '0'
           AND od.date_id = #{dateId}
@@ -131,6 +132,7 @@
               </foreach>
             )
           AND cd.EPMET_CATEGORY_CODE IS NOT NULL
+          AND cd.EPMET_CATEGORY_CODE != ''
           AND od.pid = '0'
           AND od.date_id = #{dateId}
         GROUP BY od.CATEGORY_CODE,od.pid
@@ -155,7 +157,7 @@
                 #{customer}
             </foreach>
         )
-          AND cd.EPMET_CATEGORY_CODE IS NULL
+          AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
           AND od.pid = '0'
           AND od.date_id = #{dateId}
         GROUP BY od.CATEGORY_CODE,od.pid