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

仪表盘路由

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-12-05 10:28:36 +08:00
parent 143dde08ce
commit b4b4f6cd5f
3 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/UserDashboardRuleController.php
+22 -8
View File
@@ -2,8 +2,13 @@
namespace app\admin\controller; namespace app\admin\controller;
use app\common\controller\BaseController; use app\common\controller\BaseController;
use app\common\model\Resource;
use app\common\model\Role;
use app\common\model\User;
use app\common\model\UserGroup;
use app\common\traits\crud\CrudControllerTrait; use app\common\traits\crud\CrudControllerTrait;
use app\common\service\UserDashboardRuleService; use app\common\service\UserDashboardRuleService;
use Couchbase\Group;
class UserDashboardRuleController extends BaseController class UserDashboardRuleController extends BaseController
{ {
@@ -22,12 +27,21 @@ class UserDashboardRuleController extends BaseController
* @param array $data * @param array $data
* @return array * @return array
*/ */
// protected function indexFormat($data) protected function indexFormat($data)
// { {
// if (isset($data['created_at'])) if (isset($data['created_at']))
// $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
// if (isset($data['updated_at'])) if (isset($data['updated_at']))
// $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
// return $data; if (isset($data['resources_id']))
// } $data['resources'] = Resource::where(['id' => $data['resources_id']])->first();
if (isset($data['rule_type']) && $data['rule_type'] == 'role'){
$data['related_rt'] = Role::where(['id' => $data['related']])->value('name');
}elseif (isset($data['rule_type']) && $data['rule_type'] == 'user'){
$data['related_rt'] = User::where(['id' => $data['related']])->value('name');
}elseif (isset($data['rule_type']) && $data['rule_type'] == 'group'){
$data['related_rt'] = UserGroup::where(['id' => $data['related']])->value('title');
}
return $data;
}
} }
app/common/logic/PermLogic.php
+6 -5
View File
@@ -24,11 +24,12 @@ 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)->get();
// $all = $all->merge($resources); $all = $all->merge($resources);
// } }
return $all->unique('id')->values()->sortBy('sort');
// 遍历用户的所有角色，合并每个角色所拥有的资源 // 遍历用户的所有角色，合并每个角色所拥有的资源
foreach ($user->roles as $role) { foreach ($user->roles as $role) {
app/common/logic/UserDashboardRuleLogic.php
+1 -1
View File
@@ -22,7 +22,7 @@ class UserDashboardRuleLogic
$user = User::with('reportToInfo')->find($userId);; $user = User::with('reportToInfo')->find($userId);;
//获取用户所在分组 //获取用户所在分组
$ugm = UserGroupMembers::where('user_id', $userId)->where('status', 1)->get(); $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) { $roleRule = UserDashboardRule::orWhere(function ($query) use ($user) {
$query->whereIn('related', $user->roles->pluck('id')) $query->whereIn('related', $user->roles->pluck('id'))