From 33e2ae63129f7defbaceec3755418aa0071fd3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 18 Jan 2024 13:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=92=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AA=E8=AE=A4=E8=AF=81=E5=92=8C=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/BaseFpZhMapper.xml    | 17 +++++++++++++++++
 .../main/resources/mapper/BaseSggxcxMapper.xml  |  3 +++
 .../src/main/resources/mapper/FpZhMapper.xml    |  7 +++++++
 3 files changed, 27 insertions(+)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 4232ae31..a9cd0dd4 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -83,6 +83,13 @@
         <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
             and t.bdk_status in ('1','2')
         </if>
+        <if test="rzclzt != null and (rzclzt == '0'.toString() or rzclzt == '6'.toString())">
+            AND t.inaccount_status = '1'
+            AND t.rzh_yesorno = '0'
+            <if test=" bzdh == ''">
+                and t.bzdh is not null
+            </if>
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
@@ -368,6 +375,16 @@
         <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
             and t.bdk_status in ('1','2')
         </if>
+
+        <if test="rzclzt != null and (rzclzt == '0'.toString() or rzclzt == '6'.toString())">
+            AND t.inaccount_status = '1'
+            AND t.rzh_yesorno = '0'
+            <if test=" bzdh == ''">
+                and t.bzdh is not null
+            </if>
+        </if>
+
+
         <if  test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index e3f0b072..5c50827a 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -523,6 +523,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
+        <if test=" bzdh == ''">
+            and t.bzdh is not null
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index be2b498c..3cdd444b 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -115,6 +115,13 @@
         <if test="rzclzt != null and rzclzt != '0'.toString() and rzclzt != '6'.toString()">
             and t.bdk_status in ('1','2')
         </if>
+        <if test="rzclzt != null and (rzclzt == '0'.toString() or rzclzt == '6'.toString())">
+            AND t.inaccount_status = '1'
+            AND t.rzh_yesorno = '0'
+            <if test=" bzdh == ''">
+                and t.bzdh is not null
+            </if>
+        </if>
         <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
             and t.invoice_status = #{invoiceStatus}
         </if>