Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!475

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

@@ -801,7 +801,7 @@ public class CrmController {
 				List<CrmClientData> datas = CrmClientData.builder().build().selectList(new QueryWrapper<CrmClientData>()
 						.lambda().eq(CrmClientData::getBelongGroup, gid)
 						.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
-						.eq(type != null && type >= 0, CrmClientData::getClientType, type)
+						.eq(type != null && type >= 0, CrmClientData::getClientType, type).like(!StrUtil.isBlank(customerowner), CrmClientData::getBelongUserName, customerowner)
 						.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
 						.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
 						.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)