From e52a97ae510a9077cf342033081107d1035da88d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Mon, 4 Dec 2023 14:27:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A5=A8=E6=B1=A0=E5=AF=BC=E5=87=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E4=B8=BA=E5=B7=B2?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index 6da5dbf4..c58beccd 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -299,12 +299,15 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99'">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99' and rzzt != '3'.toString()">
             and t.rzh_yesorno = #{rzzt}
         </if>
         <if test='rzzt == "99"'>
             and t.rzh_yesorno in ('1','2','0')
         </if>
+        <if test='rzzt == "3"'>
+            and t.rzh_yesorno in ('1','2')
+        </if>
         <if test="rzlx != null and rzlx != '' and rzlx != 'null' and rzlx != '99'">
             and t.rzlx = #{rzlx}
         </if>
@@ -549,12 +552,15 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99'">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99' and rzzt != '3'.toString()">
             and t.rzh_yesorno = #{rzzt}
         </if>
         <if test='rzzt == "99"'>
             and t.rzh_yesorno in ('1','2','0')
         </if>
+        <if test='rzzt == "3"'>
+            and t.rzh_yesorno in ('1','2')
+        </if>
         <if test="rzlx != null and rzlx != '' and rzlx != 'null' and rzlx != '99'">
             and t.rzlx = #{rzlx}
         </if>