From 469f60f873326b7598e16f903e0ed0c7652f4918 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 10 Oct 2023 16:10:41 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=B7=B2=E8=AE=A4=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=A4=E8=AF=81=E8=AF=81=E4=BA=BA=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=88=90damin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/BaseFpZhMapper.xml  | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 33696feb..57ef2f1e 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -155,15 +155,11 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
-        <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            <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 test="rzhr == 'admin'">
+            and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
+        </if>
+        <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
+            and t.confirm_user like CONCAT(#{rzhr},'%')
         </if>
         <if
                 test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
@@ -437,15 +433,11 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
-        <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            <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 test="rzhr == 'admin'">
+            and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '')
+        </if>
+        <if test="rzhr != null and rzhr != '' and rzhr != 'null' and rzhr != 'admin'">
+            and t.confirm_user like CONCAT(#{rzhr},'%')
         </if>
         <if test="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' ">
             <![CDATA[ AND t.payment_date >= #{paymentDateStart} ]]>