From 2f162806094612d94d288e5a2fa68057e3366667 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Mon, 1 Aug 2022 21:55:28 +0800 Subject: [PATCH] fixed role --- beike/Admin/Http/Controllers/AdminRoleController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/beike/Admin/Http/Controllers/AdminRoleController.php b/beike/Admin/Http/Controllers/AdminRoleController.php index dfe18b08..7d6e8389 100644 --- a/beike/Admin/Http/Controllers/AdminRoleController.php +++ b/beike/Admin/Http/Controllers/AdminRoleController.php @@ -39,10 +39,11 @@ class AdminRoleController extends Controller public function edit(Request $request, int $id) { - $adminUser = Auth::guard(AdminUser::AUTH_GUARD)->user(); + $role = Role::query()->findOrFail($id); + $permissionRepo = (new PermissionRepo())->setRole($role); $data = [ - 'permissions' => (new PermissionRepo($adminUser))->getAllPermissions(), - 'role' => Role::query()->findOrFail($id) + 'permissions' => $permissionRepo->getAllPermissions(), + 'role' => $role, ]; app()['cache']->forget('spatie.permission.cache'); return view('admin::pages.admin_roles.edit', $data);