diff --git a/app/Models/User.php b/app/Models/User.php index 79d639e..c4778ce 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -78,6 +78,7 @@ class User extends Authenticatable $this->roles->each(fn (Role $role) => $query->orWhereIn('permissions.id', $role->permissions->pluck('id'))); })->orDoesntHave('permissions'); }) + ->orderBy('position') ->with('childs') ->get(); } diff --git a/resources/js/Components/DashboardLayout/Sidebar.vue b/resources/js/Components/DashboardLayout/Sidebar.vue index a460279..c7cec56 100644 --- a/resources/js/Components/DashboardLayout/Sidebar.vue +++ b/resources/js/Components/DashboardLayout/Sidebar.vue @@ -1,10 +1,11 @@