|
|
|
|
@ -220,14 +220,14 @@ class UserController extends BaseController
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
// 旧数据
|
|
|
|
|
// 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->orWhereRaw('company_tag', 'like', '%' . $v . '%');
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
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']);
|
|
|
|
|
|