From eee1264bb6dc20cbafe7071aff4f7f50da67d82d Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Sun, 8 Oct 2023 16:23:50 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E7=AD=9B=E9=80=89ad?=
 =?UTF-8?q?min=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 30e678fe..fb931d17 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -156,10 +156,11 @@
             and t.qs_name = #{qsr}
         </if>
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            and t.confirm_user in
+            and (t.confirm_user in
             <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
+            or t.confirm_user is null or t.confirm_user = '')
         </if>
         <if
                 test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
@@ -434,10 +435,11 @@
             and t.qs_name = #{qsr}
         </if>
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            and t.confirm_user in
+            and (t.confirm_user in
             <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
+            or t.confirm_user is null or t.confirm_user = '')
         </if>
         <if test="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' ">
             <![CDATA[ AND t.payment_date >= #{paymentDateStart} ]]>