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} + + and (p.comp_code = #{queryParams.companyCode} or p.comp_code = '' or p.comp_code is null) + + and p.customs_code = #{queryParams.customsCode} 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,