From c49bf01f162e9e7435c5272c665fa5e7b3a813c1 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Mon, 9 Feb 2026 17:49:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Middleware/CheckPermission.php |  6 ++---
 app/Services/AdminMenuService.php       |  2 +-
 database/seeders/AdminMenuSeeder.php    | 30 ++++++++++++++++---------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/Http/Middleware/CheckPermission.php b/app/Http/Middleware/CheckPermission.php
index 6753e91..f060adc 100644
--- a/app/Http/Middleware/CheckPermission.php
+++ b/app/Http/Middleware/CheckPermission.php
@@ -43,8 +43,8 @@ class CheckPermission
      */
     protected function passedOrNot($action, $uriArr): bool
     {
-        $characters = '/api/admin/';
-        $action = ltrim($action, $characters);
+        $search = '/api/admin/';
+        $action = str_replace($search, '', $action);
 
         if (in_array($action, $uriArr)) {
             return false;
@@ -56,7 +56,7 @@ class CheckPermission
         $newAction = $actionArr[0] ?? '';
 
         // 特殊
-        if (in_array($newAction, ['logout', 'me'])) {
+        if (in_array($newAction, ['logout', 'me', 'menu'])) {
             return false;
         }
 
diff --git a/app/Services/AdminMenuService.php b/app/Services/AdminMenuService.php
index 2910c3a..523864b 100644
--- a/app/Services/AdminMenuService.php
+++ b/app/Services/AdminMenuService.php
@@ -89,7 +89,7 @@ final class AdminMenuService
         if (!$menus_id) {
             return [];
         }
-        return $this->getMenuTreeList($menus_id);
+        return $this->getMenuTreeList($menus_id, 1);
     }
 
     /**
diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php
index 5949522..6dc0a60 100644
--- a/database/seeders/AdminMenuSeeder.php
+++ b/database/seeders/AdminMenuSeeder.php
@@ -103,9 +103,9 @@ class AdminMenuSeeder extends Seeder
             ],
             [
                 'id'         => 9,
-                'parent_id'  => 0,
+                'parent_id'  => 8,
                 'order'      => 0,
-                'title'      => '角色管理',
+                'title'      => '用户列表',
                 'icon'       => '',
                 'uri'        => '',
                 'show'       => 1,
@@ -115,6 +115,16 @@ class AdminMenuSeeder extends Seeder
                 'id'         => 10,
                 'parent_id'  => 8,
                 'order'      => 0,
+                'title'      => '角色管理',
+                'icon'       => '',
+                'uri'        => '',
+                'show'       => 1,
+                'created_at' => $not_datetime
+            ],
+            [
+                'id'         => 11,
+                'parent_id'  => 9,
+                'order'      => 0,
                 'title'      => '只读',
                 'icon'       => '',
                 'uri'        => 'users.index',
@@ -122,8 +132,8 @@ class AdminMenuSeeder extends Seeder
                 'created_at' => $not_datetime
             ],
             [
-                'id'         => 11,
-                'parent_id'  => 8,
+                'id'         => 12,
+                'parent_id'  => 9,
                 'order'      => 0,
                 'title'      => '查看',
                 'icon'       => '',
@@ -132,8 +142,8 @@ class AdminMenuSeeder extends Seeder
                 'created_at' => $not_datetime
             ],
             [
-                'id'         => 12,
-                'parent_id'  => 8,
+                'id'         => 13,
+                'parent_id'  => 9,
                 'order'      => 0,
                 'title'      => '添加',
                 'icon'       => '',
@@ -142,8 +152,8 @@ class AdminMenuSeeder extends Seeder
                 'created_at' => $not_datetime
             ],
             [
-                'id'         => 13,
-                'parent_id'  => 8,
+                'id'         => 14,
+                'parent_id'  => 9,
                 'order'      => 0,
                 'title'      => '编辑',
                 'icon'       => '',
@@ -152,8 +162,8 @@ class AdminMenuSeeder extends Seeder
                 'created_at' => $not_datetime
             ],
             [
-                'id'         => 14,
-                'parent_id'  => 8,
+                'id'         => 15,
+                'parent_id'  => 9,
                 'order'      => 0,
                 'title'      => '删除',
                 'icon'       => '',