From 1d2b7b3f4b60ca67515f8342b263c5eb92a7cecb Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 15 Nov 2022 11:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IcResiComparisonRecordDao.xml      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml
index 584f234505..ff9e7a7fb1 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiComparisonRecordDao.xml
@@ -60,18 +60,18 @@
     <select id="getResiComparisonList" resultType="com.epmet.dto.result.ResiComparisonListResultDTO">
         SELECT
             a.id resiId,
-            a.`name` resiName,
-            a.id_card resiIdCard,
-            b.id comparisonRecordId,
-            b.police_name policeName,
-            b.police_id_card policeIdCard,
-            b.type type,
-            IF (b.type = '1', '已处理', '未处理') typeName,
-            b.identical identical,
-            (case b.identical when '0' then '否' when '1' then '是' WHEN '2' THEN '-' else '否' end ) identicalName,
-            b.is_comparison isComparison,
-            IF (b.is_comparison = '1', '是', '否') isComparisonName,
-            b.comparison_result comparisonResult
+        a.`name` resiName,
+        a.id_card resiIdCard,
+        b.id comparisonRecordId,
+        b.police_name policeName,
+        b.police_id_card policeIdCard,
+        IFNULL(b.type, '0') type,
+        IF (b.type = '1', '已处理', '未处理') typeName,
+        IFNULL(b.identical, '0') identical,
+        (case b.identical when '0' then '否' when '1' then '是' WHEN '2' THEN '-' else '否' end ) identicalName,
+        IFNULL(b.is_comparison, '0') isComparison,
+        IF (b.is_comparison = '1', '是', '否') isComparisonName,
+        b.comparison_result comparisonResult
         FROM
             ic_resi_user a
         <choose>