From 7a7abb73019226ff1884ee8b2954371321de0b1b 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, 7 Nov 2023 15:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E4=BA=BA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=92=8C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/CustomsJkszhcxMapper.xml   | 10 ++++++++--
 .../resources/mapper/DomesticExportInvoiceMapper.xml | 12 ++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
index 72bfed55..b6a6b3b6 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
@@ -80,9 +80,12 @@
         <if test="bdkStatus != null and bdkStatus != '' and bdkStatus != 'null' and bdkStatus != '99'">
             and t.bdk_status = #{bdkStatus}
         </if>
-        <if test="confirmUser != null and confirmUser != '' and confirmUser != 'null' ">
+        <if test="confirmUser != null and confirmUser != '' and confirmUser != 'null' and confirmUser != 'admin'">
             and t.confirm_user like CONCAT(#{confirmUser},'%')
         </if>
+        <if test="confirmUser == 'admin'">
+            and (t.confirm_user = #{confirmUser} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+        </if>
         <if test="glzt != null and glzt != '' and glzt != 'null' and glzt != '99'">
             and t.glzt = #{glzt}
         </if>
@@ -245,9 +248,12 @@
         <if test="bdkStatus != null and bdkStatus != '' and bdkStatus != 'null' and bdkStatus != '99'">
             and t.bdk_status = #{bdkStatus}
         </if>
-        <if test="confirmUser != null and confirmUser != '' and confirmUser != 'null' ">
+        <if test="confirmUser != null and confirmUser != '' and confirmUser != 'null' and confirmUser != 'admin'">
             and t.confirm_user like CONCAT(#{confirmUser},'%')
         </if>
+        <if test="confirmUser == 'admin'">
+            and (t.confirm_user = #{confirmUser} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
+        </if>
         <if test="glzt != null and glzt != '' and glzt != 'null' and glzt != '99'">
             and t.glzt = #{glzt}
         </if>
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
index dc1fe591..99399a87 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
@@ -376,10 +376,14 @@
             and p.export_no = #{queryParams.exportNo}
         </if>
 
-        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!=''">
+        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!='' and queryParams.confirmUser != 'admin'">
             and p.confirm_user = #{queryParams.confirmUser}
         </if>
 
+        <if test="queryParams.confirmUser == 'admin'">
+            and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4'
+        </if>
+
         <if test="queryParams.invoiceType!=null and queryParams.invoiceType!=''">
             and p.invoice_type = #{queryParams.invoiceType}
         </if>
@@ -454,10 +458,14 @@
             and p.export_no = #{queryParams.exportNo}
         </if>
 
-        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!=''">
+        <if test="queryParams.confirmUser!=null and queryParams.confirmUser!='' and queryParams.confirmUser != 'admin'">
             and p.confirm_user = #{queryParams.confirmUser}
         </if>
 
+        <if test="queryParams.confirmUser == 'admin'">
+            and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4'
+        </if>
+
         <if test="queryParams.invoiceType!=null and queryParams.invoiceType!=''">
             and p.invoice_type = #{queryParams.invoiceType}
         </if>