From da9738c17a0a30ee86af1a8e84c3a262ef49fd40 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 3 Jul 2023 15:31:44 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseInvoiceManualCheckServiceImpl.java    | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index 45093a48..c8384fb1 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -602,10 +602,11 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
             if(sysDeptEntity != null) {
                 String dId = sysDeptEntity.getDeptId();
                 log.info("获取deptId为:{}",dId);
-                gfsh = getGfsh(dId, taxnoMap, parentIdMap);
-                gfshList.add(gfsh);
-                log.info("获取的税号为：{}",gfsh);
-
+                if(StringUtils.isNotEmpty(dId)) {
+                    gfsh = getGfsh(dId, taxnoMap, parentIdMap);
+                    gfshList.add(gfsh);
+                    log.info("获取的税号为：{}", gfsh);
+                }
             }
         }
         log.info("购方税号list为：{}",gfshList);
@@ -615,13 +616,16 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
     }
 
     private String getGfsh(String deptId,Map<String, String> taxnoMap,Map<String, String> parentIdMap) {
-        log.info("deptId={}",deptId);
-        String taxno = taxnoMap.get(deptId);
-
-        if(StringUtils.isEmpty(taxno)){
-            deptId = parentIdMap.get(deptId);
-            log.info("获取map中的deptId:{}",deptId);
-            getGfsh(deptId,taxnoMap,parentIdMap);
+        String taxno = "";
+        if(StringUtils.isNotEmpty(deptId)) {
+            log.info("deptId={}", deptId);
+            taxno = taxnoMap.get(deptId);
+
+            if (StringUtils.isEmpty(taxno)) {
+                deptId = parentIdMap.get(deptId);
+                log.info("获取map中的deptId:{}", deptId);
+                getGfsh(deptId, taxnoMap, parentIdMap);
+            }
         }
         return taxno;
     }