|
|
|
|
@ -213,21 +213,18 @@ class UserController extends BaseController
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
// company_tag等价于company_type,新旧数据兼容
|
|
|
|
|
if (isset($all['company_type'])) {
|
|
|
|
|
$all['company_tag'] = $all['company_type'];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 新数据
|
|
|
|
|
if (isset($all['company_tag'])) {
|
|
|
|
|
$list = $list->whereHas('company', function ($query) use ($all) {
|
|
|
|
|
$query->where('company_tag', 'like', '%' . $all['company_tag'] . '%');
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
// 旧数据
|
|
|
|
|
if (isset($all['company_type'])) {
|
|
|
|
|
$company_type = explode(',', $all['company_type']);
|
|
|
|
|
$list = $list->whereHas('company', function ($query) use ($company_type) {
|
|
|
|
|
foreach ($company_type as $v) {
|
|
|
|
|
$query->orWhere('company_tag', 'like', '%' . $v . '%');
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$list = $list->whereHas('courseSigns', function ($query) use ($all) {
|
|
|
|
|
if (isset($all['course_id'])) {
|
|
|
|
|
$query->where('course_id', $all['course_id']);
|
|
|
|
|
|