diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml index 72bfed55..b6a6b3b6 100644 --- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml +++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml @@ -80,9 +80,12 @@ and t.bdk_status = #{bdkStatus} - + and t.confirm_user like CONCAT(#{confirmUser},'%') + + and (t.confirm_user = #{confirmUser} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' + and t.glzt = #{glzt} @@ -245,9 +248,12 @@ and t.bdk_status = #{bdkStatus} - + and t.confirm_user like CONCAT(#{confirmUser},'%') + + and (t.confirm_user = #{confirmUser} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' + and t.glzt = #{glzt} diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml index dc1fe591..99399a87 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml +++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml @@ -376,10 +376,14 @@ and p.export_no = #{queryParams.exportNo} - + and p.confirm_user = #{queryParams.confirmUser} + + and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4' + + and p.invoice_type = #{queryParams.invoiceType} @@ -454,10 +458,14 @@ and p.export_no = #{queryParams.exportNo} - + and p.confirm_user = #{queryParams.confirmUser} + + and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4' + + and p.invoice_type = #{queryParams.invoiceType}