仪表盘路由

app/common/logic/PermLogic.php

@@ -24,11 +24,12 @@ 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)->get();
+            $all = $all->merge($resources);
+        }
+        return $all->unique('id')->values()->sortBy('sort');
 
         // 遍历用户的所有角色，合并每个角色所拥有的资源
         foreach ($user->roles as $role) {

app/common/logic/UserDashboardRuleLogic.php

@@ -22,7 +22,7 @@ class UserDashboardRuleLogic
         $user = User::with('reportToInfo')->find($userId);;
         //获取用户所在分组
         $ugm = UserGroupMembers::where('user_id', $userId)->where('status', 1)->get();
-        $group_id = $ugm?$ugm->group_id:0;
+        $group_id = isset($ugm->group_id)?$ugm->group_id:0;
 
         $roleRule = UserDashboardRule::orWhere(function ($query) use ($user) {
                 $query->whereIn('related', $user->roles->pluck('id'))