From dcc5ab610fe4a1fc2a919801514d5363300eb056 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:54:31 +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

---
 .../customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java  | 1 +
 .../service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java  | 1 +
 .../src/main/resources/mapper/DomesticExportInvoiceMapper.xml   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

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 c7cdd916..31fb64aa 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,6 +148,7 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     pageList.get(i).setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
 
                     String confirmUser = pageList.get(i).getConfirmUser();
+                    log.info("认证状态：{}",pageList.get(i).getAuthStatus());
                     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 8af323e3..c0a64a01 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,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 if (!"0".equals(cxrzStatus) && !"5".equals(cxrzStatus)) {
                     map.put("select", false);
                 }
+                log.info("认证状态：{}",map.get("authStatus"));
                 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 17966066..dc1fe591 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml
@@ -1115,7 +1115,7 @@
         </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'
+            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!=''">