diff --git a/app/Http/Controllers/Admin/AuthController.php b/app/Http/Controllers/Admin/AuthController.php index 66dd3ac..a168fb8 100644 --- a/app/Http/Controllers/Admin/AuthController.php +++ b/app/Http/Controllers/Admin/AuthController.php @@ -21,20 +21,12 @@ class AuthController extends Controller public function index(Request $request) { $keyword = $request->get('keyword', null); - $source = $request->input("source"); - $platform = $request->input("platform"); $page_size = $request->get('page_size', 15); $admin_users = Admin::query() ->when($keyword, function ($query) use ($keyword) { $query->where('name', 'like', "%$keyword%") ->orWhere('mobile', 'like', "%$keyword%"); }) - ->when($source, function ($query) use ($source) { - $query->where('source', $source); - }) - ->when($platform, function ($query) use ($platform) { - $query->where('platform', "like", "%$platform%"); - }) ->orderByDesc('id') ->paginate($page_size); return $this->success('ok', $admin_users); diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 518daf4..fa3b362 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -49,6 +49,15 @@ class UserController extends Controller ->orWhere('mobile', 'like', '%' . $keyword . '%')->orWhere('mobile', aesEncryptCBC($keyword)); }); } + // $source = $request->input("source"); + // $users = $users->when($source, function ($query) use ($source) { + // $query->where('source', $source); + // }); + + $platform = $request->input("platform"); + $users = $users->when($platform, function ($query) use ($platform) { + $query->where('platform', "like", "%$platform%"); + }); $source = $request->input("source"); if (!empty($source)) { $source = json_decode($source, true);