From 0ae8b61383ccf0c1e8d92a568ba1adaa47da0e84 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 10 Oct 2023 15:01:33 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=B7=B2=E8=AE=A4=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=A4=E8=AF=81=E8=AF=81=E4=BA=BA=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=88=90damin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 4 +++-
 .../customs/service/impl/CustomsRecordDkrzServiceImpl.java  | 2 +-
 .../ckzrz/impl/DomesticExportCustomsCkServiceImpl.java      | 6 ++++--
 .../impl/DomesticCustomsRefundServiceImpl.java              | 2 +-
 .../drawback/impl/DomesticInvoiceDrawbackServiceImpl.java   | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
index 267a4192..a5c26332 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
@@ -160,7 +160,9 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                         pageList.get(i).setInvoiceAmount(
                             AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getInvoiceAmount())));
 
-                        if(StringUtils.isEmpty(pageList.get(i).getRzr())){
+                        String rzclzt = pageList.get(i).getRzclzt();
+
+                        if(StringUtils.isEmpty(pageList.get(i).getRzr()) && "4".equals(rzclzt)){
                             pageList.get(i).setRzr("admin");
                         }
 
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 cab90f35..fd36cc97 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
@@ -1227,7 +1227,7 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     String bdkStatus = (String)map.get("bdkStatus");
                     String rzhYesorno = (String)map.get("rzhYesorno");
                     String confirmUser = (String)map.get("confirmUser");
-                    if(StringUtils.isEmpty(confirmUser)){
+                    if(StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
                         map.put("confirmUser","admin");
                     }
 
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 e1dd3d47..88df3fd9 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
@@ -559,7 +559,9 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 String bdkStatus = (String)map.get("bdkStatus");
                 String rzhYesorno = (String)map.get("rzhYesorno");
                 String confirmUser = (String)map.get("confirmUser");
-                if(StringUtils.isEmpty(confirmUser)){
+                String authStatus = (String)map.get("authStatus");
+
+                if(StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
                     map.put("confirmUser","admin");
                 }
 
@@ -583,7 +585,7 @@ public class DomesticExportCustomsCkServiceImpl extends ServiceImpl<DomesticExpo
                 String glzt = (String)map.get("glzt");
                 map.put("glzt", dictdetaServcice.queryDictName(DictConstant.GLZT, glzt));
                 map.put("rzhYesorno", dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzhYesorno));
-                String authStatus = (String)map.get("authStatus");
+
                 map.put("authStatus", dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, authStatus));
                 map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));;
                 map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
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 b97f884c..eafb373b 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
@@ -516,7 +516,7 @@ public class DomesticCustomsRefundServiceImpl extends MpBaseServiceImpl<Domestic
                 }
 
                 String confirmUser = (String)map.get("confirmUser");
-                if(org.apache.commons.lang.StringUtils.isEmpty(confirmUser)){
+                if(org.apache.commons.lang.StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
                     map.put("confirmUser","admin");
                 }
 
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 e44616a7..d381645a 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
@@ -374,7 +374,7 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
                 result.setInAccountStatus("未入账");
             }
             String authenticationPerson = result.getAuthenticationPerson();
-            if(StringUtils.isEmpty(authenticationPerson)){
+            if(StringUtils.isEmpty(authenticationPerson) && "4".equals(result.getAuthenticationStatus())){
                 result.setAuthenticationPerson("admin");
             }
         });