Merge branch 'feature/merge' into develop

2025-12-05 10:34:41 +08:00
parent ac982b0957 82673cdcfa
commit 521cfec00a
1 changed files with 0 additions and 1 deletions
@@ -29,7 +29,6 @@ class PermLogic
            $resources = Resource::where('id', $resources_id)->get();
            $all = $all->merge($resources);
        }
-        return $all->unique('id')->values()->sortBy('sort');

        // 遍历用户的所有角色，合并每个角色所拥有的资源
        foreach ($user->roles as $role) {