From dbcf7f6afff264bf3c5cbe3628a7ad74e4b226d4 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 14:28:33 +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

---
 .../service/impl/CustomsCustomsJkszhcxServiceImpl.java      | 2 +-
 .../ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java      | 4 ++++
 .../main/resources/mapper/DomesticExportInvoiceMapper.xml   | 6 +++++-
 dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml   | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
index 2c784178..c7cdd916 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
@@ -148,7 +148,7 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     pageList.get(i).setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
 
                     String confirmUser = pageList.get(i).getConfirmUser();
-                    if(StringUtils.isEmpty(confirmUser) && "4".equals(auditStatus)){
+                    if(StringUtils.isEmpty(confirmUser) && "4".equals(pageList.get(i).getAuthStatus())){
                         pageList.get(i).setConfirmUser("admin");
                     }
                 }
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
index 4ff2b432..8af323e3 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
@@ -609,6 +609,10 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 if (!"0".equals(cxrzStatus) && !"5".equals(cxrzStatus)) {
                     map.put("select", false);
                 }
+                if (StringUtils.isBlank((String) map.get("confirmUser")) && "4".equals(map.get("authStatus"))) {
+                    map.put("confirmUser","admin");
+                }
+
             }
 
         }
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
index 9bc5b0b7..17966066 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
@@ -1110,10 +1110,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 t.confirm_user is null or t.confirm_user = '') and p.auth_status = '4'
+        </if>
+
         <if test="queryParams.invoiceType!=null and queryParams.invoiceType!=''">
             and p.invoice_type = #{queryParams.invoiceType}
         </if>
diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
index 4b44b5f1..5e2f8043 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
@@ -145,7 +145,7 @@
         <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 = '')
+                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
                 </when>
                 <otherwise>
                     and t.confirm_user like CONCAT(#{rzhr},'%')
@@ -414,7 +414,7 @@
         <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 = '')
+                    and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4'
                 </when>
                 <otherwise>
                     and t.confirm_user like CONCAT(#{rzhr},'%')