From ceb9c8c2594a323f37685a9db87538df5d32d62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= Date: Tue, 4 May 2021 10:53:45 +0800 Subject: [PATCH] Fix #176 --- app/Http/Controllers/Admin/UserController.php | 10 +++++++--- resources/lang/zh_CN/notification.php | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 498b6369..01f5340e 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -169,9 +169,13 @@ class UserController extends Controller // 只有超级管理员才能赋予超级管理员 $roles = $request->input('roles'); try { - if ($roles && (Auth::getUser()->can('give roles') || (in_array('Super Admin', $roles, true) - && Auth::getUser()->hasRole('Super Admin')) || Auth::getUser()->hasRole('Super Admin'))) { - $user->syncRoles($roles); + if (isset($roles)) { + if (Auth::getUser()->can('give roles') || Auth::getUser()->hasRole('Super Admin') + || (in_array('Super Admin', $roles, true) && Auth::getUser()->hasRole('Super Admin'))) { + $user->syncRoles($roles); + } + } else { + $user->roles()->detach(); } // Input checking for dummy diff --git a/resources/lang/zh_CN/notification.php b/resources/lang/zh_CN/notification.php index d2e5b54f..220cbae2 100644 --- a/resources/lang/zh_CN/notification.php +++ b/resources/lang/zh_CN/notification.php @@ -32,4 +32,4 @@ return [ 'download' => '下载', 'total' => '总计', ], -]; \ No newline at end of file +];