From 5e625c6e2dd66054a3158e2ca74ecc0fc6d4a5b2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 14 Dec 2020 17:36:03 +0800
Subject: [PATCH] =?UTF-8?q?selectDifficulty=E6=96=B9=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9EVENT=5FCATEGORY=5FNAME=E4=B8=BAnull=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?''?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/screen/ScreenDifficultyDataDao.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index a342420f2d..dc1320fa4d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -12,7 +12,7 @@
             ROUND(diff.EVENT_COST_TIME/60,0) AS totalHours,
             diff.EVENT_SOURCE AS gridName,
             diff.EVENT_IMG_URL AS imgUrl,
-            diff.EVENT_CATEGORY_NAME AS categoryName,
+            IFNULL(diff.EVENT_CATEGORY_NAME,'') AS categoryName,
             diff.EVENT_RE_ORG AS handleDepts,
             diff.EVENT_RE_ORG AS handleCount
         FROM