From cd21a84cf4727fd1ee6ca55af0336ceb75b28248 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 15 Nov 2022 12:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/IcResiComparisonRecordDao.xml      | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 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 ff9e7a7fb1..a4b098bb07 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
@@ -74,26 +74,13 @@
         b.comparison_result comparisonResult
         FROM
             ic_resi_user a
-        <choose>
-           <when test='identical == null or identical == "" or identical == "0" or type == null and type == "" or type == "0" '>
-                LEFT JOIN ic_resi_comparison_record b ON a.id = b.resi_id AND b.del_flag = '0'
-                <if test="identical != null and identical != ''">
-                    AND b.identical =#{identical}
-                </if>
-                <if test="type != null and type != ''">
-                    AND b.type =#{type}
-                </if>
-            </when>
-            <otherwise>
-                INNER JOIN ic_resi_comparison_record b ON a.id = b.resi_id AND b.del_flag = '0'
-                <if test="identical != null and identical != ''">
-                    AND b.identical =#{identical}
-                </if>
-                <if test="type != null and type != ''">
-                    AND b.type =#{type}
-                </if>
-            </otherwise>
-        </choose>
+        LEFT JOIN ic_resi_comparison_record b ON a.id = b.resi_id AND b.del_flag = '0'
+        <if test='identical != null and identical != "" and identical == "0" '>
+            AND b.identical =#{identical}
+        </if>
+        <if test='type != null and type != "" and type == "0" '>
+            AND b.type =#{type}
+        </if>
         WHERE
             a.del_flag = '0'
         AND a.customer_id = #{customerId}
@@ -101,6 +88,12 @@
         <if test="idCard != null and idCard != ''">
             AND a.id_card =#{idCard}
         </if>
+        <if test='identical != null and identical != "" and identical != "0" '>
+            AND b.identical =#{identical}
+        </if>
+        <if test='type != null and type != "" and type != "0" '>
+            AND b.type =#{type}
+        </if>
         ORDER BY a.pids ASC, b.created_time DESC
     </select>