diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index e02ab718..4b44b5f1 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -140,8 +140,17 @@ and t.qs_name = #{qsr} + + - and t.confirm_user like CONCAT(#{rzhr},'%') + + + and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') + + + and t.confirm_user like CONCAT(#{rzhr},'%') + + and t.settlement_no like concat(#{settlementNo},'%') @@ -403,7 +412,14 @@ and t.qs_name = #{qsr} - and t.confirm_user like CONCAT(#{rzhr},'%') + + + and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') + + + and t.confirm_user like CONCAT(#{rzhr},'%') + + and t.glzt = #{glzt}