From 548ce3bc2854bab79ba7a69c77223c30e9c51608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Sun, 10 Jan 2021 07:36:25 +0800
Subject: [PATCH] Fix #116, #118, #119

---
 app/Http/Controllers/Admin/UserController.php | 2 +-
 app/Observers/UserObserver.php                | 2 +-
 resources/views/admin/user/index.blade.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 @@
                     </div>
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
                         <select class="form-control" id="level" name="level" onChange="Search()">
-                            <option value="" hidden>用户分组</option>
+                            <option value="" hidden>用户等级</option>
                             @foreach($levels as $key => $level)
                                 <option value="{{$key}}">{{$level}}</option>
                             @endforeach