diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 26409c9..9c1bf21 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -216,9 +216,6 @@ class UserController extends BaseController if (isset($all['company_tag'])) { $list = $list->whereHas('company', function ($query) use ($all) { $query->where('company_tag', 'like', '%' . $all['company_tag'] . '%'); - if ($all['company_tag'] == '被投企业') { - $query->orWhere('is_yh_invested', 1); - } }); } $list = $list->whereHas('courseSigns', function ($query) use ($all) { @@ -262,6 +259,9 @@ class UserController extends BaseController }); } $list = $list->where(function ($query) use ($all) { + if (isset($all['from'])) { + $query->where('from', $all['from']); + } if (isset($all['is_vip'])) { $query->where('is_vip', $all['is_vip']); }