|
@@ -70,7 +70,12 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
|
|
|
|
|
|
QueryWrapper<Object> wrapper = Wrappers.query();
|
|
|
|
|
|
- wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()), "ap.payment_remark", dto.getKeyword());
|
|
|
+ if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
|
+ wrapper.and(q -> q
|
|
|
+ .like(ObjectUtil.isNotEmpty(dto.getKeyword()), "ap.payment_remark", dto.getKeyword())
|
|
|
+ .or().like(ObjectUtil.isNotEmpty(dto.getKeyword()), "ap.amount", dto.getKeyword())
|
|
|
+ );
|
|
|
+ }
|
|
|
|
|
|
// 归属公司
|
|
|
wrapper.eq(ObjectUtil.isNotEmpty(dto.getCorporationId()), "ap.corporation_id", dto.getCorporationId());
|