From 6944fe4ae7e251109cac347fbdf14c50ecab6e19 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 30 May 2023 15:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E7=A8=8E=E5=8F=B7=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E9=AA=8C=E8=AF=81=E6=98=AF=E5=90=A6=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=8A=B5=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java    | 2 +-
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java        | 3 ++-
 2 files changed, 3 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 8954882d..32868ded 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
@@ -155,7 +155,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())) {
+                        if (!gfshList1.contains(pageList.get(i).getGfsh()) && (gfshList != null || gfshList.size() != 0)) {
                             pageList.get(i).setSelect(false);
                         }
                         if ("1".equals(pageList.get(i).getOutStatus()) || "2".equals(pageList.get(i).getOutStatus())) {
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 e7722fcd..35048de5 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
@@ -238,7 +238,8 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                         vo.setSelect(false);
                         vo.setUpgradeStatus("0");
                     }
-                    if (!gfshList1.contains(pageList.get(i).getGfTaxNo())) {
+
+                    if (!gfshList1.contains(pageList.get(i).getGfTaxNo()) && (gfshList != null ||gfshList.size() != 0)) {
                         vo.setSelect(false);
                         vo.setBkgxts("该发票税号已申请抵扣统计");
                         voList.add(vo);