From e4b6913e0d32043cb0d0faf85ca31a1243b586c2 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Sun, 8 Oct 2023 14:10:05 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E8=AE=A4=E8=AF=81=E4=BA=BA=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=20=E9=9C=80=E8=A6=81=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=B8=BAadmin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customs/service/impl/CustomsRecordDkrzServiceImpl.java   | 4 ++++
 .../ckzrz/impl/DomesticExportCustomsCkServiceImpl.java       | 4 ++++
 .../customsrefund/impl/DomesticCustomsRefundServiceImpl.java | 5 +++++
 .../drawback/impl/DomesticInvoiceDrawbackServiceImpl.java    | 4 ++++
 4 files changed, 17 insertions(+)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
index 5eccd675..cab90f35 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
@@ -1226,6 +1226,10 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     String cxrzStatus = (String)map.get("cxrzStatus");
                     String bdkStatus = (String)map.get("bdkStatus");
                     String rzhYesorno = (String)map.get("rzhYesorno");
+                    String confirmUser = (String)map.get("confirmUser");
+                    if(StringUtils.isEmpty(confirmUser)){
+                        map.put("confirmUser","admin");
+                    }
 
                     map.put("xh", String
                         .valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
index c78b3820..e1dd3d47 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportCustomsCkServiceImpl.java
@@ -558,6 +558,10 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 String cxrzStatus = (String)map.get("cxrzStatus");
                 String bdkStatus = (String)map.get("bdkStatus");
                 String rzhYesorno = (String)map.get("rzhYesorno");
+                String confirmUser = (String)map.get("confirmUser");
+                if(StringUtils.isEmpty(confirmUser)){
+                    map.put("confirmUser","admin");
+                }
 
                 map.put("xh",
                     String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java
index ed131d23..b97f884c 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/customsrefund/impl/DomesticCustomsRefundServiceImpl.java
@@ -515,6 +515,11 @@ public class DomesticCustomsRefundServiceImpl extends MpBaseServiceImpl<Domestic
                     map.put("inAccountStatus","未入账");
                 }
 
+                String confirmUser = (String)map.get("confirmUser");
+                if(org.apache.commons.lang.StringUtils.isEmpty(confirmUser)){
+                    map.put("confirmUser","admin");
+                }
+
                 if (map.get("fillInDate") != null) {
                     map.put("fillInDate", map.get("fillInDate"));
                 }
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java
index 3d2a9ada..e44616a7 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java
@@ -373,6 +373,10 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
             }else {
                 result.setInAccountStatus("未入账");
             }
+            String authenticationPerson = result.getAuthenticationPerson();
+            if(StringUtils.isEmpty(authenticationPerson)){
+                result.setAuthenticationPerson("admin");
+            }
         });
         if (dto.getCurrentPage() == 1) {
             QuerySummaryDTO querySummaryDTO = domesticRecordInvoiceDao.selectTotalAmountByAuthenticationCheck(dto);