diff --git a/app/Http/Controllers/Admin/CompanyController.php b/app/Http/Controllers/Admin/CompanyController.php index 2cfed43..764e7df 100644 --- a/app/Http/Controllers/Admin/CompanyController.php +++ b/app/Http/Controllers/Admin/CompanyController.php @@ -223,6 +223,20 @@ class CompanyController extends BaseController } continue; } + if ($key == 'ranking_tag') { + $valueArray = explode(',', $value); + if (!empty($valueArray)) { + $query->where(function ($q) use ($valueArray) { + foreach ($valueArray as $item) { + $item = trim($item); + if (!empty($item)) { + $q->orWhere('ranking_tag', 'like', '%' . $item . '%'); + } + } + }); + } + continue; + } // 等于 if ($op == 'eq') { diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 1efdf1e..12f5dc6 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -263,6 +263,25 @@ class UserController extends BaseController }); } + // 榜单标签查询 + if (isset($all['ranking_tag'])) { + $list = $list->whereHas('company', function ($query) use ($all) { + $string = explode(',', $all['ranking_tag']); + $query->where(function ($q) use ($string) { + foreach ($string as $index => $v) { + $trimmed = trim($v); + if (!empty($trimmed)) { + if ($index === 0) { + $q->where('ranking_tag', 'like', '%' . $trimmed . '%'); + } else { + $q->orWhere('ranking_tag', 'like', '%' . $trimmed . '%'); + } + } + } + }); + }); + } + $list = $list->whereHas('courseSigns', function ($query) use ($all) { if (isset($all['course_id'])) { $query->where('course_id', $all['course_id']);