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

---
 .../mapper/TDxCustomsRecordMapper.xml         | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
index 9e5632c2..a65566df 100644
--- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
@@ -1037,11 +1037,11 @@
         FROM
         t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code
         where t.user_account = #{queryParams.userAccount}
-        <if test="gfsh!=null">
+        <if test="queryParams.gfsh!=null">
             and t.gf_tax_no =#{queryParams.gfsh}
         </if>
-        <if test="companyCode!=null">
-            and t.comp_code =#{companyCode}
+        <if test="queryParams.companyCode!=null">
+            and t.comp_code =#{queryParams.companyCode}
         </if>
 
         <if test="queryParams.qsDateBegin!=null and queryParams.qsDateBegin!=''">
@@ -1121,11 +1121,11 @@
         FROM
         t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code
         where t.user_account = #{queryParams.userAccount}
-        <if test="gfsh!=null">
-            and t.gf_tax_no =#{gfsh}
+        <if test="queryParams.gfsh!=null">
+            and t.gf_tax_no =#{queryParams.gfsh}
         </if>
-        <if test="companyCode!=null">
-            and t.comp_code =#{companyCode}
+        <if test="queryParams.companyCode!=null">
+            and t.comp_code =#{queryParams.companyCode}
         </if>
 
         <if test="queryParams.qsDateBegin!=null and queryParams.qsDateBegin!=''">
@@ -1218,12 +1218,12 @@
     </select>
     <sql id="queryCustomsRefundConfirm_sql">
         auth_status != '0' and (rzlx = '2' or  rzlx = '3')
-        <if test="gfsh!=null">
-            and gf_tax_no = #{gfsh}
+        <if test="queryParams.gfsh!=null">
+            and gf_tax_no = #{queryParams.gfsh}
         </if>
 
-        <if test="companyCode!=null">
-            and comp_code = #{companyCode}
+        <if test="queryParams.companyCode!=null">
+            and comp_code = #{queryParams.companyCode}
         </if>
         <if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
             and customs_code = #{queryParams.customsCode}