From 07621b92147a58e7a2066b931b2396bcd27aa464 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 30 May 2023 15:40:22 +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

---
 .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java    | 3 ++-
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java        | 3 ++-
 2 files changed, 4 insertions(+), 2 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 99e56d8a..284451e8 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,6 +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);
             List<Tax> taxList = (List<Tax>)pramsMap.get("taxList");
             List<String> orgList = new ArrayList<>();
             for (Tax t : taxList) {
@@ -155,7 +156,7 @@ 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)) {
+                        if (!gfshList1.contains(pageList.get(i).getGfsh()) && gfshList != null && gfshList.size() != 0) {
                             log.info("税号一申请抵扣");
                             pageList.get(i).setSelect(false);
                         }
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 35048de5..cd219b5b 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
@@ -75,6 +75,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
 
             List<BaseSggxCxRespVO> voList = new ArrayList<>();
             List<String> gfshList = (List<String>)pramsMap.get("gfsh");
+            log.info("购方税号{}",gfshList);
             String qsflag = (String)pramsMap.get("qsflag");
             List<String> gfshList1 = new ArrayList<>();
             if (gfshList.size() > 0) {
@@ -239,7 +240,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                         vo.setUpgradeStatus("0");
                     }
 
-                    if (!gfshList1.contains(pageList.get(i).getGfTaxNo()) && (gfshList != null ||gfshList.size() != 0)) {
+                    if (!gfshList1.contains(pageList.get(i).getGfTaxNo()) && gfshList != null && gfshList.size() != 0) {
                         vo.setSelect(false);
                         vo.setBkgxts("该发票税号已申请抵扣统计");
                         voList.add(vo);