From 57b1c2b5c80f8cb7c15f0e5e2b93b203c9ae98aa Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 10 Oct 2023 17:02:22 +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

---
 .../base/controller/BaseInvoiceController.java     | 12 ++++++++----
 .../src/main/resources/mapper/BaseFpZhMapper.xml   | 14 +++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 3fb07ab0..c03498cd 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -186,10 +186,14 @@ public class BaseInvoiceController extends AbstractController {
         pramsMap.put("xfmc", xfmc);
         pramsMap.put("qsr", qsr);
         if (StringUtils.isNotBlank(rzhr)) {
-            String[] split = rzhr.split(",");
-            if (!Arrays.asList(split).contains("")) {
-                String[] split1 = rzhr.split(",");
-                pramsMap.put("rzhr", Arrays.asList(split1));
+            if("admin".equals(rzhr)){
+                pramsMap.put("rzhr", rzhr);
+            }else {
+                String[] split = rzhr.split(",");
+                if (!Arrays.asList(split).contains("")) {
+                    String[] split1 = rzhr.split(",");
+                    pramsMap.put("rzhr", Arrays.asList(split1));
+                }
             }
         }
 
diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 3d68865d..265c6a6a 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -156,11 +156,7 @@
             and t.qs_name = #{qsr}
         </if>
         <if test="rzhr == 'admin'">
-            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 = '')
+            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 in
@@ -440,12 +436,8 @@
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name = #{qsr}
         </if>
-        <if test="rzhr == '[admin]'">
-            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 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 in