From 522c44eef499cf716bf23470e25cbbd1d43fe0a9 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 15 Aug 2023 19:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E6=AC=BE=E4=B9=A6=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customs/service/impl/CustomsSignServiceImpl.java   |  2 +-
 .../src/main/resources/mapper/CustomsRecordMapper.xml  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
index df2ab5ff..b29e84b5 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
@@ -84,7 +84,7 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl<CustomsRecordDao,
         JSONObject tabulateMenu = tabulateRedisService.getTabulateMenu(userInfo.getCompany(), entity.getMenuId());
         resultData.putTabulateMenu(tabulateMenu);
 
-        if (entity.getGfTaxNo() == null && CollectionUtils.isEmpty(entity.getGfTaxNoList())) {
+        if (org.apache.commons.lang3.StringUtils.isBlank(entity.getGfsh())) {
             return resultData.getPageData(null).toJsonBase();
         }
 
diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
index 457d1315..c73c4b7c 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
@@ -768,8 +768,8 @@
         FROM
         t_dx_customs_record t
         where t.qs_status = '0'
-        and t.gf_tax_no = #{gfsh}
-        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
+        and t.gf_tax_no = #{queryParams.gfsh}
+        and (t.comp_code = #{queryParams.companyCode} or t.comp_code = '' or t.comp_code is null)
         and t.export_mark = '0'
         and (t.data_sources = '0' or (t.data_sources != '0' and t.collect_upload_status = '2'))
         <if test="queryParams.fillInDateBegin!=null and queryParams.fillInDateBegin!=''">
@@ -994,9 +994,9 @@
         r.comp_code as compCode
         FROM
         t_dx_customs t left join t_dx_customs_record r on t.customs_code = r.customs_code
-        where  r.gf_tax_no = #{gfsh}
-        and (r.comp_code = #{companyCode} or r.comp_code = '' or r.comp_code is null)
-        t.user_account = #{queryParams.userAccount}
+        where  r.gf_tax_no = #{queryParams.gfsh}
+        and (r.comp_code = #{queryParams.companyCode} or r.comp_code = '' or r.comp_code is null)
+        and t.user_account = #{queryParams.userAccount}
         <if test="queryParams.qsDateBegin!=null and queryParams.qsDateBegin!=''">
             and t.qs_date &gt;= #{queryParams.qsDateBegin}
         </if>