xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/merge' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-12-04 18:11:52 +08:00
parent 81445a7096 143dde08ce
commit d9e2c89c0e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/logic/PermLogic.php
+5 -5
View File
@@ -24,11 +24,11 @@ class PermLogic
$all = collect(); $all = collect();
//获取仪表盘 //获取仪表盘
$resources_id = (new UserDashboardRuleLogic)->getUserDashboard($userId); // $resources_id = (new UserDashboardRuleLogic)->getUserDashboard($userId);
if(!empty($resources_id)){ // if(!empty($resources_id)){
$resources = Resource::where('id', $resources_id)->first(); // $resources = Resource::where('id', $resources_id)->first();
$all = $all->merge($resources); // $all = $all->merge($resources);
} // }
// 遍历用户的所有角色，合并每个角色所拥有的资源 // 遍历用户的所有角色，合并每个角色所拥有的资源
foreach ($user->roles as $role) { foreach ($user->roles as $role) {