|
@@ -31,6 +31,7 @@ import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
+import com.ruoyi.common.utils.wrapper.SqlField;
|
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -91,6 +92,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
|
|
|
wrapper.like("c", Customer::getName, dto.getName());
|
|
|
// 业务员查询
|
|
|
wrapper.eq("c", Customer::getUserId, dto.getUserId());
|
|
|
+ // 关键字
|
|
|
+ wrapper.keyword(dto.getKeyword(),
|
|
|
+ new SqlField("c", Customer::getName),
|
|
|
+ new SqlField("c", Customer::getCode));
|
|
|
|
|
|
// 客户标签查询(多个标签用逗号隔开)
|
|
|
if (StrUtil.isNotBlank(dto.getTag())) {
|