diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java index 2c784178..c7cdd916 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java @@ -148,7 +148,7 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl - + and p.confirm_user = #{queryParams.confirmUser} + + and (p.confirm_user = #{queryParams.confirmUser} or t.confirm_user is null or t.confirm_user = '') and p.auth_status = '4' + + and p.invoice_type = #{queryParams.invoiceType} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index 4b44b5f1..5e2f8043 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -145,7 +145,7 @@ - and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') + and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' and t.confirm_user like CONCAT(#{rzhr},'%') @@ -414,7 +414,7 @@ - and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') + and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' and t.confirm_user like CONCAT(#{rzhr},'%')