From ca80ebafe7cdc84b6997dc367ae626059b0fd829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 10 Oct 2023 10:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AE=A4=E8=AF=81=E4=BA=BAadmin=E6=97=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E5=88=B0=E8=AE=A4=E8=AF=81=E4=BA=BA=E4=B8=BA?=
 =?UTF-8?q?=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

---
 .../main/resources/mapper/ExtBbfpzhMapper.xml | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
index e02ab718..4b44b5f1 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
@@ -140,8 +140,17 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
+
+
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            and t.confirm_user like CONCAT(#{rzhr},'%')
+            <choose>
+                <when test="rzhr = 'admin'">
+                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
+                </when>
+                <otherwise>
+                    and t.confirm_user like CONCAT(#{rzhr},'%')
+                </otherwise>
+            </choose>
         </if>
         <if test="settlementNo != null and settlementNo != ''">
             and t.settlement_no like concat(#{settlementNo},'%')
@@ -403,7 +412,14 @@
             and t.qs_name = #{qsr}
         </if>
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            and t.confirm_user like CONCAT(#{rzhr},'%')
+            <choose>
+                <when test="rzhr = 'admin'">
+                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
+                </when>
+                <otherwise>
+                    and t.confirm_user like CONCAT(#{rzhr},'%')
+                </otherwise>
+            </choose>
         </if>
         <if test="glzt != null and glzt != '' and glzt != 'null' and glzt != '99'">
             and t.glzt = #{glzt}