From c8a813475678d493d043a08a407d013499d2bdb4 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 16 Aug 2023 17:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81=E5=92=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/base/controller/BaseDktjController.java     | 3 +++
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseDktjController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseDktjController.java
index d5aa1064..81bf3be2 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseDktjController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseDktjController.java
@@ -112,6 +112,9 @@ public class BaseDktjController extends AbstractController {
     @SysLog("调用抵扣统计和撤销统计查询入口接口")
     public Object listStatisticalEnterprise(@RequestBody Map<String, Object> map) {
         String gfsh = (String)map.get("gfsh");
+        if (org.apache.commons.lang3.StringUtils.isBlank(gfsh)){
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
+        }
         String skssq = (String)map.get("skssq");
         String tjzt = (String)map.get("tjzt");
         String qrtjzt = (String)map.get("qrtjzt");
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 98d65b50..9ce89b82 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -80,7 +80,7 @@
         and t.inaccount_status = '1'
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
-        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+        and t.comp_code = #{companyCode}
         <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
             and t.invoice_status in ('0','7')
             and t.invoice_amount>0
@@ -411,7 +411,7 @@
         and t.export_mark = '0'
         and t.company = #{company}
         and t.gf_tax_no = #{gfsh}
-        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+        and t.comp_code = #{companyCode}
         <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
             and t.invoice_status in ('0','7')
             and t.invoice_amount>0