|
@@ -72,7 +72,10 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
|
|
|
List<Long> ids = list.stream().map(Customer::getId).collect(Collectors.toList());
|
|
|
wrapper.and(q -> q.in(SalesContract::getCustomerId, ids).or().like(SalesContractVo::getContractAmount, dto.getKeyword()));
|
|
|
}else{
|
|
|
- wrapper.and(q -> q.like(SalesContractVo::getContractAmount, dto.getKeyword()));
|
|
|
+ wrapper.and(q -> q
|
|
|
+ .like(SalesContractVo::getContractAmount, dto.getKeyword())
|
|
|
+ .or().like(SalesContract::getCode,dto.getKeyword())
|
|
|
+ );
|
|
|
}
|
|
|
}
|
|
|
wrapper.orderByDesc("sc", SalesContract::getId);
|