diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index c3e1f7b..7b9765d 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -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']); diff --git a/课程台账.xlsx b/课程台账.xlsx deleted file mode 100644 index b1e5186..0000000 Binary files a/课程台账.xlsx and /dev/null differ