|
@@ -2494,7 +2494,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
QueryWrapper<User> wrapper = new QueryWrapper<User>()
|
|
QueryWrapper<User> wrapper = new QueryWrapper<User>()
|
|
- .select("id", "name", "job_number").eq("company_id", user.getCompanyId()).eq("is_active", 1);
|
|
|
|
|
|
+ .select("id", "name", "job_number")
|
|
|
|
+ .eq("company_id", user.getCompanyId())
|
|
|
|
+ .eq("is_active", 1)
|
|
|
|
+ .like(org.apache.commons.lang3.StringUtils.isNotBlank(keyword),"name",keyword);
|
|
if (departmentId != null) {
|
|
if (departmentId != null) {
|
|
//获取全部子部门
|
|
//获取全部子部门
|
|
List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
|
|
List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
|