From b1715774305d6e6ffc700fef2a39c0db0616fe04 Mon Sep 17 00:00:00 2001
From: "mzl@hnxinyouhe.com" <mzl>
Date: Wed, 13 Aug 2025 19:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/controller/PresetController.php | 19 +++++++++++++++++++
 app/common/service/UserService.php         | 10 +++++-----
 config/route.php                           |  1 +
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/common/controller/PresetController.php b/app/common/controller/PresetController.php
index 569a895..37073c4 100644
--- a/app/common/controller/PresetController.php
+++ b/app/common/controller/PresetController.php
@@ -9,6 +9,7 @@ use app\common\service\CorpFeishuAppService;
 use app\common\service\SystemsService;
 use app\common\service\UserService;
 use support\Cache;
+use app\common\service\PermService;
 
 class PresetController extends BaseController
 {
@@ -85,4 +86,22 @@ class PresetController extends BaseController
             return $this->error($e->getMessage());
         }
     }
+
+    public function menus(Request $request)
+    {
+        try {
+            $uid = $request->user->uid;
+            $systemCode = $request->system_code;
+            $permService = new PermService();
+            $menuTree = $permService->getMenuTree($uid, $systemCode);
+            $permissionCodes = $permService->getPermissionCodes($uid, $systemCode);
+            $result = [
+                'menu' => $menuTree, 
+                'permissions' => $permissionCodes
+            ];
+            return $this->success($result, '获取菜单权限');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php
index 1d5dab4..cccda73 100644
--- a/app/common/service/UserService.php
+++ b/app/common/service/UserService.php
@@ -25,9 +25,9 @@ class UserService
     public function getUserInfo(int $uid, string $systemCode)
     {
         $user = $this->logic->userInfo($uid);
-        $permService = new PermService();
-        $menuTree = $permService->getMenuTree($uid, $systemCode);
-        $permissionCodes = $permService->getPermissionCodes($uid, $systemCode);
+        // $permService = new PermService();
+        // $menuTree = $permService->getMenuTree($uid, $systemCode);
+        // $permissionCodes = $permService->getPermissionCodes($uid, $systemCode);
         return [
             'user' => [
                 'id' => $user->id,
@@ -38,8 +38,8 @@ class UserService
                 'status' => $user->status,
                 'roles' => $user->roles->pluck('name')
             ],
-            'menu' => $menuTree, 
-            'permissions' => $permissionCodes
+            // 'menu' => $menuTree, 
+            // 'permissions' => $permissionCodes
         ];
     }
 
diff --git a/config/route.php b/config/route.php
index d1fd613..7b93165 100644
--- a/config/route.php
+++ b/config/route.php
@@ -60,6 +60,7 @@ Route::group('/common', function () {
         Route::any('/systems', [app\common\controller\PresetController::class, 'systems']);
         Route::any('/roles', [app\common\controller\PresetController::class, 'roles']);
         Route::any('/cache/clear', [app\common\controller\PresetController::class, 'cacheClear']);
+        Route::any('/menus', [app\common\controller\PresetController::class, 'menus']);
     });
 });