From 2252f1cd3d78facb4cb07c9815176dcf64fa60bf Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 3 Jul 2023 09:29:31 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseInvoiceController.java     | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index 0f8a2c32..ad94ed47 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -198,20 +198,7 @@ public class BaseInvoiceController extends AbstractController {
         if (!StringUtils.isNotBlank(gfsh)){
             pramsMap.put("sign","88");
         }
-        List<String> gfshList = new ArrayList<>();
-        if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
-            gfshList.add(gfsh);
-        } else {
-            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-        }
-        pramsMap.put("gfsh", gfshList);
 
-        boolean flag = checkList(gfshList);
-
-        if (flag){
-            pramsMap.put("sign","88");
-            log.info("登陆账号无税号");
-        }
         //所属组织
 //        List<String> companyCodeList = new ArrayList<>();
 //        if (StringUtils.isNotBlank(companyCode)){
@@ -227,6 +214,24 @@ public class BaseInvoiceController extends AbstractController {
             pramsMap.put("companyCode",companyCode);
         }
 
+        //判断购方税号
+        List<String> gfshList = new ArrayList<>();
+        if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
+            gfshList.add(gfsh);
+        } else {
+//            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
+            gfshList = getGfshList(gfshList,getUserInfo().getCompanyCodes());
+        }
+        pramsMap.put("gfsh", gfshList);
+
+        boolean flag = checkList(gfshList);
+
+        if (flag){
+            pramsMap.put("sign","88");
+            log.info("登陆账号无税号");
+        }
+
+
         if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){
 //            List<String> rates = new ArrayList<>();
 //            rates = convertRates(taxRate,rates);