Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!499

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

@@ -523,7 +523,7 @@ public class CrmController {
 						.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getLastFollowTime, startFollowTime)
 						.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getLastFollowTime, startFollowTime)
 						.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getLastFollowTime, endFollowTime).like(!StrUtil.isBlank(like), CrmClientData::getBelongUserName, like).or()
 						.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getLastFollowTime, 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).having("org_code = {0}", orgCode).having("belong_user = {0}", empNum)
 						.orderByDesc(CrmClientData::getCreateTime));
 						.orderByDesc(CrmClientData::getCreateTime));
 	}
 	}