仪表盘路由
This commit is contained in:
@@ -22,6 +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->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'))
|
||||||
@@ -31,8 +32,8 @@ class UserDashboardRuleLogic
|
|||||||
$query->where('related', $userId)
|
$query->where('related', $userId)
|
||||||
->where('rule_type', 'user');
|
->where('rule_type', 'user');
|
||||||
})
|
})
|
||||||
->orWhere(function ($query) use ($ugm) {
|
->orWhere(function ($query) use ($group_id) {
|
||||||
$query->where('related', $ugm->group_id)
|
$query->where('related', $group_id)
|
||||||
->where('rule_type', 'group');
|
->where('rule_type', 'group');
|
||||||
})
|
})
|
||||||
->orderBy('weight','desc')
|
->orderBy('weight','desc')
|
||||||
|
|||||||
Reference in New Issue
Block a user