导出

2 years ago · a4f287aa1d
parent 3eedd3f465
commit a4f287aa1d
1 changed files with 2 additions and 2 deletions
--- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
@ -1127,10 +1127,10 @@
        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="queryParams.gfsh!=null">
-            and t.gf_tax_no =#{queryParams.gfsh}
+            and r.gf_tax_no =#{queryParams.gfsh}
        </if>
        <if test="queryParams.companyCode!=null">
-            and t.comp_code =#{queryParams.companyCode}
+            and (r.comp_code =#{queryParams.companyCode} or r.comp_code is null or r.comp_code = '')
        </if>

        <if test="queryParams.qsDateBegin!=null and queryParams.qsDateBegin!=''">