Merge branch 'develop' into feature/user0812

# Conflicts: # app/admin/service/UserService.php # config/route.php
2025-08-14 10:09:56 +08:00
parent d78567e780 f8da1a1a4b
commit f326665716
19 changed files with 881 additions and 277 deletions
@@ -34,9 +34,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,
@@ -47,8 +47,8 @@ class UserService
                'status' => $user->status,
                'roles' => $user->roles->pluck('name')
            ],
-            'menu' => $menuTree, 
-            'permissions' => $permissionCodes
+            // 'menu' => $menuTree, 
+            // 'permissions' => $permissionCodes
        ];
    }