diff --git a/app/common/logic/PermLogic.php b/app/common/logic/PermLogic.php
index b4fe819..b30e6f8 100644
--- a/app/common/logic/PermLogic.php
+++ b/app/common/logic/PermLogic.php
@@ -3,27 +3,56 @@
 namespace app\common\logic;
 
 use app\common\model\User;
+use app\common\model\Resource;
 
 class PermLogic
 {
     /**
-     * 获取用户所有资源（合并角色+直接分配）
+     * 获取用户所有资源（合并角色+直接分配），并加入公共菜单，排序按sort字段
      */
     public function getUserResources(int $userId)
     {
+        // 获取用户及其关联角色资源和直接分配的资源
         $user = User::with(['roles.resources', 'resources'])->find($userId);
+
         if (!$user) {
             return collect();
         }
 
         $all = collect();
+
+        // 合并角色资源，排除不需要权限认证的资源
         foreach ($user->roles as $role) {
-            $all = $all->merge($role->resources);
+            $all = $all->merge(
+                $role->resources->filter(function ($resource) {
+                    // 只保留需要权限认证的资源（或公共资源）
+                    return !$resource->no_auth;
+                })
+            );
         }
-        $all = $all->merge($user->resources);
-        return $all->unique('id')->values();
+
+        // 合并用户直接分配的资源，排除不需要权限认证的资源
+        $all = $all->merge(
+            $user->resources->filter(function ($resource) {
+                // 只保留需要权限认证的资源（或公共资源）
+                return !$resource->no_auth;
+            })
+        );
+
+        // 加入公共菜单，公共菜单不管是否授权，所有人都能访问
+        $publicResources = Resource::where('no_auth', 1)
+            ->orderBy('sort', 'asc') // 按 sort 字段升序排序
+            ->get();
+
+        // 合并所有公共资源
+        $all = $all->merge($publicResources);
+
+        // 返回唯一的资源列表，并按 id 排序
+        // 使用 sortBy('sort') 来确保最终结果根据 'sort' 字段排序
+        return $all->unique('id')->values()->sortBy('sort');
     }
 
+
     /**
      * 构建目录/菜单树，节点包含权限与打开方式，拼接完整路径，并对子级菜单component处理
      * @param \Illuminate\Support\Collection $resources
diff --git a/app/common/model/Role.php b/app/common/model/Role.php
index ea84200..c9eaabd 100644
--- a/app/common/model/Role.php
+++ b/app/common/model/Role.php
@@ -53,6 +53,6 @@ class Role extends Model
     // 角色拥有的资源（权限点、菜单）
     public function resources()
     {
-        return $this->belongsToMany(Resource::class, 'role_resources', 'role_id', 'resource_id');
+        return $this->belongsToMany(Resource::class, 'role_resources', 'role_id', 'resource_id')->orderBy('sort', 'asc');
     }
 }
diff --git a/app/common/model/User.php b/app/common/model/User.php
index 4709b44..e9b4627 100644
--- a/app/common/model/User.php
+++ b/app/common/model/User.php
@@ -75,7 +75,7 @@ class User extends Model
     // 用户直接拥有的资源（用于特殊补权）
     public function resources()
     {
-        return $this->belongsToMany(Resource::class, 'user_resources', 'user_id', 'resource_id');
+        return $this->belongsToMany(Resource::class, 'user_resources', 'user_id', 'resource_id')->orderBy('sort', 'asc');
     }
 
     // 用户可访问的系统
diff --git a/app/common/model/UserRoles.php b/app/common/model/UserRoles.php
new file mode 100644
index 0000000..97005ce
--- /dev/null
+++ b/app/common/model/UserRoles.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+/**
+ * user_roles 用户-角色关联
+ * @property integer $user_id 用户ID(主键)
+ * @property integer $role_id 角色ID(主键)
+ */
+class UserRoles extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'user_roles';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = null;
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = false;
+    
+    
+    protected $fillable = [
+        'user_id',
+        'role_id'
+    ];
+}
diff --git a/app/common/model/UserSystems.php b/app/common/model/UserSystems.php
new file mode 100644
index 0000000..4fb3df1
--- /dev/null
+++ b/app/common/model/UserSystems.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+/**
+ * user_systems 用户-系统关联表：描述用户可访问哪些系统
+ * @property integer $user_id 用户ID(主键)
+ * @property integer $system_id 系统ID(主键)
+ * @property integer $created_at 创建时间
+ */
+class UserSystems extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'user_systems';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = null;
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = false;
+    
+    // protected $dateFormat = 'U';
+
+    // const UPDATED_AT = false;
+    
+
+    protected $fillable = [
+        'user_id',
+        'system_id',
+        'created_at'
+    ];
+}
diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php
index f0feb2c..f9b026d 100644
--- a/app/controller/IndexController.php
+++ b/app/controller/IndexController.php
@@ -2,12 +2,17 @@
 
 namespace app\controller;
 
+use app\common\model\User;
+use app\common\model\UserRoles;
+use app\common\model\UserSystems;
 use support\Request;
+use support\Db;
+use support\Cache;
 
 class IndexController
 {
 
-    protected $noNeedLogin = ['index', 'view'];
+    protected $noNeedLogin = ['index', 'view', 'perm'];
   
     public function index(Request $request)
     {
@@ -24,4 +29,36 @@ class IndexController
         return json(['code' => 0, 'msg' => 'ok']);
     }
 
+
+    // 临时增加用户权限
+    public function perm(Request $request)
+    {
+        try { 
+            $data = $request->get();
+
+            if (Db::table('user_roles')->where('user_id', $data['user_id'])->first()) {
+                Db::table('user_roles')->where('user_id', $data['user_id'])->update([
+                    'role_id' => $data['role_id']
+                ]);
+            } else {
+                Db::table('user_roles')->insert([
+                    'user_id' => $data['user_id'],
+                    'role_id' => $data['role_id']
+                ]);
+            }
+
+            if (!Db::table('user_systems')->where('user_id', $data['user_id'])->where('system_id', $data['system_id'])->first()) {
+                Db::table('user_systems')->where('user_id', $data['user_id'])->insert([
+                    'user_id' => $data['user_id'],
+                    'system_id' => $data['system_id'],
+                    'created_at' => time()
+                ]);
+            }
+
+            Cache::delete("user_resources_{$data['user_id']}");
+            return json(['code' => 0, 'msg' => 'success']);
+        } catch (\Throwable $e) {
+            return json(['code' => 1, 'msg' => $e->getMessage()]);
+        }
+    }
 }
\ No newline at end of file
diff --git a/config/route.php b/config/route.php
index b87f54a..dd8fafd 100644
--- a/config/route.php
+++ b/config/route.php
@@ -25,6 +25,8 @@ use Webman\Route;
 // POST /admin/user/{user_id}/kickout // body: {"tokens": ["..."]} // 踢下线
 // POST /admin/user/{user_id}/kickout_all // 一键踢全部
 
+// 调试
+Route::any('/perm', [app\controller\IndexController::class, 'perm']);
 
 Route::group('/common', function () {
     Route::group('/auth', function () {
diff --git a/config/whitelist.php b/config/whitelist.php
index d1669b3..1736876 100644
--- a/config/whitelist.php
+++ b/config/whitelist.php
@@ -2,8 +2,12 @@
 
 return [
     'basi_cdata' => [
-        '/',
-        '/index/index',
-        '/index/view'
+        '/',    // 首页
+        '/index/index', // 首页
+        '/index/view', // 飞书调试
+        '/perm', // 调试-添加权限
+
+        '/common/preset/corps', // 公司列表
+        '/common/preset/feishu/app', // 飞书应用信息
     ]
 ];
\ No newline at end of file