From 60e02298bcf3aeba3a34acdc72c8682b206ad6ae Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 18 Oct 2023 14:15:46 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=AE=A4=E8=AF=81=E4=BA=BA=E6=98=AFad?=
 =?UTF-8?q?min=E7=9A=84=E6=97=B6=E5=80=99,=E6=9F=A5=E8=AF=A2=E5=B7=B2?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=9A=84=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index c2613178..194e2588 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -155,12 +155,15 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
-        <if test="rzhr != null and rzhr != '' and rzhr != 'null'">
+        <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
             and t.confirm_user in
             <foreach collection="rzhr" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
+        <if test="rzhr == 'admin'">
+            and (t.confirm_user = #{rzhr} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+        </if>
         <if
                 test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
             and t.invoice_no = #{invoiceNo}