From ed0fce7b184bb9c3b12474c628bbd5926dec6a53 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Fri, 18 Aug 2023 14:07:30 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/base/controller/BaseTDxTaxCurrentController.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java
index 975b18f8..45090815 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java
@@ -87,6 +87,11 @@ public class BaseTDxTaxCurrentController extends AbstractController {
     @SysLog("调用企业税务信息查询接口")
     public ResponseEntity<?> listTaxCurrent(@RequestBody Map<String, Object> map) {
         String gfsh = (String)map.get("gfsh");
+
+        if(map.get("gfsh") == null || "".equals(map.get("gfsh")) || "99".equals(map.get("gfsh").toString())){
+            return ResponseEntity.ok(R.error("购方税号不能为空"));
+        }
+
         String xydj = (String)map.get("xydj");
         String sbzq = (String)map.get("sbzq");
         int curr = (int)map.get("curr");
@@ -99,8 +104,6 @@ public class BaseTDxTaxCurrentController extends AbstractController {
         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);
         if (!StringHelper.isBlank(xydj)) {