From 880465cc334c8f3e60b67333f8e1058599fb5c5c Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 24 Aug 2023 17:02:40 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/TDxExportCustomsDao.xml      | 4 ++--
 .../src/main/resources/mapper/TDxExportInvoiceDao.xml      | 4 ++--
 .../src/main/resources/mapper/CustomsJkszhcxMapper.xml     | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
index d61790e2..2dbef056 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
@@ -363,7 +363,7 @@
         p.bdk_status as bdkStatus,
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
-        p.cxrz_status as cxrzStatus
+        p.cxrz_status as cxrzStatus,
         p.sn_voucher_number as snVoucherNumber,
         p.posting_time as postingTime,
         p.image_id as imageId,
@@ -424,7 +424,7 @@
             and p.gf_tax_no = #{gfsh}
         </if>
         <if test="queryParams.companyCode!=null ">
-            and p.comp_code = #{companyCode}
+            and (p.comp_code = #{companyCode} or p.comp_code = '' or p.comp_code is null)
         </if>
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
             and p.customs_code = #{queryParams.customsCode}
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
index 5a32939c..531bc218 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
@@ -369,7 +369,7 @@
         p.bdk_status as bdkStatus,
         p.confirm_user as confirmUser,
         p.rzh_belong_date as rzhBelongDate,
-        p.cxbdk_status as cxbdkStatus
+        p.cxbdk_status as cxbdkStatus,
         p.sn_voucher_number as snVoucherNumber,
         p.posting_time as postingTime,
         p.image_id as imageId,
@@ -429,7 +429,7 @@
             and p.gf_tax_no = #{gfsh}
         </if>
         <if test="queryParams.companyCode!=null">
-            and p.comp_code = #{companyCode}
+            and (p.comp_code = #{companyCode} or p.comp_code = '' or p.comp_code is null)
         </if>
         <if test="queryParams.rzhYesorno!=null and queryParams.rzhYesorno!=''">
             and p.rzh_yesorno = #{queryParams.rzhYesorno}
diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
index 57875232..98daaedc 100644
--- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
+++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml
@@ -51,10 +51,9 @@
         t.customs_scan_id,t.dept_name businessName
         ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code
         from t_dx_customs_record t
-        where export_mark = '0' and t.gf_tax_no in
-        <foreach close=")" collection="gfsh" index="index" item="item" open="(" separator=",">
-            #{item}
-        </foreach>
+        where export_mark = '0'
+        and t.gf_tax_no = #{gfsh}
+        and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>