diff --git a/app/Admin/Controllers/AdminController.php b/app/Admin/Controllers/AdminController.php index 40cf9b8..f4e10aa 100644 --- a/app/Admin/Controllers/AdminController.php +++ b/app/Admin/Controllers/AdminController.php @@ -19,7 +19,7 @@ abstract class AdminController extends Controller $params['_editable'] = implode(',', $editable); } - return $this->getUpdatePath() . '?' . http_build_query($params); + return $this->getUpdatePath().'?'.http_build_query($params); } public function update(Request $request) diff --git a/app/Admin/Middleware/CheckPermission.php b/app/Admin/Middleware/CheckPermission.php index 88f5191..0c864e9 100644 --- a/app/Admin/Middleware/CheckPermission.php +++ b/app/Admin/Middleware/CheckPermission.php @@ -89,6 +89,7 @@ class CheckPermission ->when(Admin::permission(), fn (Collection $collection, Permission $permission) => $collection->merge($permission->authExcept)->merge($permission->permissionExcept)) ->map(function ($path) { $path = trim((string) config('admin.route.prefix'), '/').'/'.trim((string) $path, '/'); + return ltrim($path, '/'); }) ); diff --git a/app/Models/AdminUser.php b/app/Models/AdminUser.php index 841bc08..070d811 100644 --- a/app/Models/AdminUser.php +++ b/app/Models/AdminUser.php @@ -54,7 +54,7 @@ class AdminUser extends Model } $parent = $allPermissions->get($parent->parent_id); - }; + } } unset($allPermissions, $rolePermissions);