From 1422fd23fc5710f0f44afa29a2035c28e8c3c991 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 10 Oct 2023 14:52:28 +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

---
 .../service/impl/CustomsCustomsJkszhcxServiceImpl.java       | 2 +-
 .../count/impl/DomesticCustomsExportCountServiceImpl.java    | 2 +-
 .../count/impl/DomesticInvoiceExportCountServiceImpl.java    | 2 +-
 .../dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java    | 5 +++--
 4 files changed, 6 insertions(+), 5 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 ec1f51b0..e9aba68e 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
@@ -150,7 +150,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)){
+                    if(StringUtils.isEmpty(confirmUser) && "4".equals(auditStatus)){
                         pageList.get(i).setConfirmUser("admin");
                     }
                 }
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java
index 6185c907..61f2a811 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java
@@ -93,7 +93,7 @@ public class DomesticCustomsExportCountServiceImpl extends MpBaseServiceImpl<Dom
                 map.put("select", true);
 
                 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/count/impl/DomesticInvoiceExportCountServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticInvoiceExportCountServiceImpl.java
index de8f92bc..2dff5f82 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticInvoiceExportCountServiceImpl.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticInvoiceExportCountServiceImpl.java
@@ -90,7 +90,7 @@ public class DomesticInvoiceExportCountServiceImpl extends MpBaseServiceImpl<Dom
                 String cxbdkStatus = (String)map.get("cxbdkStatus");
                 map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxbdkStatus));
                 String confirmUser = (String)map.get("confirmUser");
-                if(StringUtils.isEmpty(confirmUser)){
+                if(StringUtils.isEmpty(confirmUser) && "4".equals(authStatus)){
                     map.put("confirmUser","admin");
                 }
                 // if (cxrzModels!=null){
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
index cb74f6ef..88a9a550 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
@@ -102,7 +102,8 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl<ExtBbfpzhDao, ExtBbf
                         }
                     }
                     String rzhr = resultList.get(i).getRzhr();
-                    if(StringUtils.isEmpty(rzhr)){
+                    String rzclzt = resultList.get(i).getRzclzt();
+                    if(StringUtils.isEmpty(rzhr) && "4".equals(rzclzt)){
                         resultList.get(i).setRzhr("admin");
                     }
 
@@ -121,7 +122,7 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl<ExtBbfpzhDao, ExtBbf
                         .setInvoiceStatus(dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
                     String rzzt = resultList.get(i).getRzzt();
                     resultList.get(i).setRzzt(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, rzzt));
-                    String rzclzt = resultList.get(i).getRzclzt();
+
                     resultList.get(i).setRzclzt(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, rzclzt));
                     String qszt = resultList.get(i).getQszt();
                     resultList.get(i).setQszt(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, qszt));