From e163b5c962e7c4b726b7208d77933882565e3562 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 30 Aug 2021 09:49:54 +0800
Subject: [PATCH] =?UTF-8?q?EPMET=5FCATEGORY=5FCODE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenProjectCategoryOrgDailyDao.xml             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
index 72f1a188a1..7a27b77e88 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/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