From 46a032eae04d26e6c0831a41e8fc9ff8b69b5a7e Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 11 May 2023 15:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomsRecordMapper.xml  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
index 112376e0..f2e6666c 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
@@ -918,9 +918,12 @@
             and p.bdk_status = #{queryParams.rzlx}
         </if>
 
-        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and  queryParams.rzhYesorno != '3'">
             and p.rzh_yesorno = #{queryParams.rzhYesorno}
         </if>
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and  queryParams.rzhYesorno == '3'">
+            and (p.rzh_yesorno = '1' or p.rzh_yesorno = '2')
+        </if>
 
         <if test="queryParams.rzhDateStart!=null and queryParams.rzhDateStart!=''">
             and p.rzh_date &gt;= #{queryParams.rzhDateStart}
@@ -1150,9 +1153,12 @@
             and p.bdk_status = #{queryParams.rzlx}
         </if>
 
-        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and queryParams.rzhYesorno != '3'">
             and p.rzh_yesorno = #{queryParams.rzhYesorno}
         </if>
+        <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!='' and queryParams.rzhYesorno == '3'">
+            and (p.rzh_yesorno = '1' or p.rzh_yesorno = '2')
+        </if>
 
         <if test="queryParams.rzhDateStart!=null and queryParams.rzhDateStart!=''">
             and p.rzh_date &gt;= #{queryParams.rzhDateStart}