From 845ed9b4163231fd95777d1ca9de858a351a4c7d 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:16:43 +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

---
 .../impl/CustomsCustomsJkszhcxServiceImpl.java       | 12 +++++++-----
 .../impl/DomesticExportInvoiceCkServiceImpl.java     | 10 ++++++----
 2 files changed, 13 insertions(+), 9 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 31fb64aa..da06f3ab 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
@@ -140,6 +140,11 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     String qsStatus = pageList.get(i).getQsStatus();
                     pageList.get(i).setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, qsStatus));
                     String authStatus = pageList.get(i).getAuthStatus();
+                    log.info("认证状态：{}",authStatus);
+                    String confirmUser = pageList.get(i).getConfirmUser();
+                    if(StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
+                        pageList.get(i).setConfirmUser("admin");
+                    }
                     pageList.get(i)
                         .setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, authStatus));
                     String qsType = pageList.get(i).getQsType();
@@ -147,11 +152,8 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
                     String rzhYesorno = pageList.get(i).getRzhYesorno();
                     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 c0a64a01..a56b7068 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
@@ -543,6 +543,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                     map.put("rzhDate", map.get("rzhDate"));
                 }
 
+                log.info("认证状态：{}",map.get("authStatus"));
+                if (StringUtils.isBlank((String) map.get("confirmUser")) && "4".equals(map.get("authStatus"))) {
+                    map.put("confirmUser","admin");
+                }
+
                 // 字典值转换
                 map.put("invoiceStatus", dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
                 map.put("rzhYesorno", dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
@@ -609,10 +614,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");
-                }
+
 
             }