From f8252150271c10a8f6d426934661d74ed7f72223 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 30 May 2023 15:49:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/fpxxrz/BaseRzFpxxServiceImpl.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 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 284451e8..2bb03762 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
@@ -63,7 +63,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
             json = tabulateRedisService.getTabulateMenu(company, menuId);
             // 合计信息,仅第一页时需要统计，减少数据库压力
             List<String> gfshList = (List<String>)pramsMap.get("gfsh");
-            log.info("购方税号{}",gfshList);
+            log.info("购方税号{}",gfshList != null && !gfshList.isEmpty());
             List<Tax> taxList = (List<Tax>)pramsMap.get("taxList");
             List<String> orgList = new ArrayList<>();
             for (Tax t : taxList) {
@@ -156,10 +156,13 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
                             && !"5".equals(pageList.get(i).getCxrzStatus())) {
                             pageList.get(i).setSelect(false);
                         }
-                        if (!gfshList1.contains(pageList.get(i).getGfsh()) && gfshList != null && gfshList.size() != 0) {
-                            log.info("税号一申请抵扣");
-                            pageList.get(i).setSelect(false);
+                        if (gfshList != null && !gfshList.isEmpty()){
+                            if (!gfshList1.contains(pageList.get(i).getGfsh())) {
+                                log.info("税号一申请抵扣");
+                                pageList.get(i).setSelect(false);
+                            }
                         }
+
                         if ("1".equals(pageList.get(i).getOutStatus()) || "2".equals(pageList.get(i).getOutStatus())) {
                             pageList.get(i).setSelect(false);
                         }