From ca3d09ef98aeedb9e9a5f0f6f897d035fe9257f3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 14 Dec 2020 18:04:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml  | 2 +-
 .../main/resources/mapper/screen/ScreenCustomerGridDao.xml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 8dd92ec0d1..9d5338ac65 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -73,7 +73,7 @@
     <select id="selectUserDistributionAgency" resultType="com.epmet.evaluationindex.screen.dto.result.UserDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
-            sca.center_mark AS centerMark,
+            IFNULL(sca.center_mark,'') AS centerMark,
             sutd.user_total AS totalNum,
             sca.area_marks AS areaMarks,
             sca.agency_name AS subName,
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index be82c07755..997ad03d98 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -23,7 +23,7 @@
         SELECT
             scg.grid_id AS gridId,
             scg.grid_name AS gridName,
-            scg.party_mark AS partyMark
+            IFNULL(scg.party_mark,'') AS partyMark
         FROM
             screen_customer_grid scg
             LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = scg.PARENT_AGENCY_ID AND sca.IS_DISPLAY = 1
@@ -37,7 +37,7 @@
     <select id="selectUserDistribution" resultType="com.epmet.evaluationindex.screen.dto.result.UserDistributionResultDTO">
         SELECT
             sutd.org_id AS subId,
-            scg.center_mark AS centerMark,
+            IFNULL(scg.center_mark,'') AS centerMark,
             sutd.user_total AS totalNum,
             scg.area_marks AS areaMarks,
             scg.grid_name AS subName,