From 8b6502d9cfd1a55f686ae1ee917ebfb470953c0f Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 24 Aug 2023 19:10:45 +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=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml | 4 ++--
 dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
index 2dbef056..731270d7 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml
@@ -421,10 +421,10 @@
     </select>
     <sql id="queryExportCustoms_sql">
         <if test="queryParams.gfsh!=null ">
-            and p.gf_tax_no = #{gfsh}
+            and p.gf_tax_no = #{queryParams.gfsh}
         </if>
         <if test="queryParams.companyCode!=null ">
-            and (p.comp_code = #{companyCode} or p.comp_code = '' or p.comp_code is null)
+            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}
diff --git a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
index 531bc218..1a5ec71f 100644
--- a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml
@@ -426,10 +426,10 @@
     </select>
     <sql id="queryExportInvoice_sql">
         <if test="queryParams.gfsh!=null">
-            and p.gf_tax_no = #{gfsh}
+            and p.gf_tax_no = #{queryParams.gfsh}
         </if>
         <if test="queryParams.companyCode!=null">
-            and (p.comp_code = #{companyCode} or p.comp_code = '' or p.comp_code is null)
+            and (p.comp_code = #{queryParams.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}