|
@@ -107,8 +107,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
|
|
|
// 关键字
|
|
|
if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
|
|
|
List<Long> cuIds = customerUserService.listObject(CustomerUser::getCustomerId, q -> q
|
|
|
- .like(CustomerUser::getName, dto.getKeyword()).or()
|
|
|
- .like(CustomerUser::getEmail, dto.getKeyword())
|
|
|
+ .and(q1 -> q1
|
|
|
+ .like(CustomerUser::getName, dto.getKeyword()).or()
|
|
|
+ .like(CustomerUser::getEmail, dto.getKeyword())
|
|
|
+ )
|
|
|
.isNotNull(CustomerUser::getCustomerId)
|
|
|
.groupBy(CustomerUser::getCustomerId)
|
|
|
);
|