From 72c68507e5275ce28f9285b78bfa3b5888613679 Mon Sep 17 00:00:00 2001
From: JaguarJack <82664165@qq.com>
Date: Tue, 23 Apr 2024 17:47:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Permissions/Http/Controllers/PermissionsController.php    | 2 +-
 modules/User/Models/Traits/UserRelations.php                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Permissions/Http/Controllers/PermissionsController.php b/modules/Permissions/Http/Controllers/PermissionsController.php
index 408e718..b7c6d4d 100644
--- a/modules/Permissions/Http/Controllers/PermissionsController.php
+++ b/modules/Permissions/Http/Controllers/PermissionsController.php
@@ -34,7 +34,7 @@ class PermissionsController extends Controller
         }
 
         return $this->model->setBeforeGetList(function ($query) {
-            return $query->with('actions')->whereIn('type', [MenuType::Top->value(), MenuType::Menu->value()]);
+            return $query->with('actions')->whereIn('type', [MenuType::Top->value(), MenuType::Menu->value()])->orderByDesc('sort');
         })->getList();
     }
 
diff --git a/modules/User/Models/Traits/UserRelations.php b/modules/User/Models/Traits/UserRelations.php
index a7bb003..c0ca750 100644
--- a/modules/User/Models/Traits/UserRelations.php
+++ b/modules/User/Models/Traits/UserRelations.php
@@ -59,7 +59,7 @@ trait UserRelations
         /* @var Permissions $permissionsModel */
         $permissionsModel = app($this->getPermissionsModel());
         if ($this->isSuperAdmin()) {
-            $permissions = $permissionsModel->get();
+            $permissions = $permissionsModel->orderByDesc('sort')->get();
         } else {
             $permissionIds = Collection::make();
             $this->roles()->with('permissions')->get()
@@ -67,7 +67,7 @@ trait UserRelations
                     $permissionIds = $permissionIds->concat($role->permissions?->pluck('id'));
                 });
 
-            $permissions = $permissionsModel->whereIn('id', $permissionIds->unique())->get();
+            $permissions = $permissionsModel->whereIn('id', $permissionIds->unique())->orderByDesc('sort')->get();
         }
 
         $this->setAttribute('permissions', $permissions->each(fn ($permission) => $permission->setAttribute('hidden', $permission->isHidden())));