From 7a289d0c65c4fe5250f409bbfe1eff5cf570ac33 Mon Sep 17 00:00:00 2001
From: mzl <mzl@hnxinyouhe.com>
Date: Mon, 14 Jul 2025 19:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PermLogic.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/common/logic/PermLogic.php b/app/common/logic/PermLogic.php
index b4d38db..b30e6f8 100644
--- a/app/common/logic/PermLogic.php
+++ b/app/common/logic/PermLogic.php
@@ -44,12 +44,15 @@ class PermLogic
             ->orderBy('sort', 'asc') // 按 sort 字段升序排序
             ->get();
 
+        // 合并所有公共资源
         $all = $all->merge($publicResources);
 
         // 返回唯一的资源列表，并按 id 排序
-        return $all->unique('id')->values()->sortBy('sort'); // 最终根据sort排序
+        // 使用 sortBy('sort') 来确保最终结果根据 'sort' 字段排序
+        return $all->unique('id')->values()->sortBy('sort');
     }
 
+
     /**
      * 构建目录/菜单树，节点包含权限与打开方式，拼接完整路径，并对子级菜单component处理
      * @param \Illuminate\Support\Collection $resources