diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 40d8b8af..db8b1d54 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -73,7 +73,7 @@ class UserController extends Controller } if (isset($group)) { - $query->whereGroupId($group); + $query->whereUserGroupId($group); } if (isset($level)) { diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index 5c103b1d..3e2b02aa 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -19,7 +19,7 @@ class UserObserver $subscribe->code = Helpers::makeSubscribeCode(); $subscribe->save(); - $allowNodes = $user->nodes()->whereType(4)->pluck('id'); + $allowNodes = $user->nodes()->whereType(4)->get()->pluck('id'); if ($allowNodes) { addUser::dispatch($user->id, $allowNodes); } diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php index c5303aa0..1a810b16 100644 --- a/resources/views/admin/user/index.blade.php +++ b/resources/views/admin/user/index.blade.php @@ -56,7 +56,7 @@