From fe741b8bbab7c8592c56843f4c27cbb69a7250e2 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 23 Aug 2023 11:36:45 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E7=BC=B4=E6=AC=BE=E4=B9=A6=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/TDxCustomsRecordMapper.xml      | 4 ++++
 dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
index f62c41d7..9e5632c2 100644
--- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
@@ -479,6 +479,10 @@
             and p.gf_tax_no = #{queryParams.gfsh}
         </if>
 
+        <if test="queryParams.companyCode!=null and queryParams.companyCode!=''">
+            and (p.comp_code = #{queryParams.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}
         </if>
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
index 826870fb..f00647bd 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
@@ -171,7 +171,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,