Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!470

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -517,7 +517,7 @@ public class CrmController {
 						.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
 						.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
 						.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
 						.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
 						.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getCreateTime, startFollowTime)
 						.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getCreateTime, startFollowTime)
-						.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getCreateTime, endFollowTime)
+						.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getCreateTime, endFollowTime).like(!StrUtil.isBlank(like), CrmClientData::getBelongUserName, like).or()
 						.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
 						.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
 						.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
 						.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
 						.orderByDesc(CrmClientData::getCreateTime));
 						.orderByDesc(CrmClientData::getCreateTime));