Merge branch 'feature/merge' into develop

2025-12-04 18:11:52 +08:00
parent 81445a7096 143dde08ce
commit d9e2c89c0e
1 changed files with 5 additions and 5 deletions
@@ -24,11 +24,11 @@ class PermLogic

        $all = collect();
        //获取仪表盘
-        $resources_id = (new UserDashboardRuleLogic)->getUserDashboard($userId);
-        if(!empty($resources_id)){
-            $resources = Resource::where('id', $resources_id)->first();
-            $all = $all->merge($resources);
-        }
+//        $resources_id = (new UserDashboardRuleLogic)->getUserDashboard($userId);
+//        if(!empty($resources_id)){
+//            $resources = Resource::where('id', $resources_id)->first();
+//            $all = $all->merge($resources);
+//        }

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