feat(资源权限): 重做服务器/资源用户权限分配交互支撑
- userPermissions 接口返回手机号字段用于矩阵展示 - 支持前端按用户-资源开关矩阵进行分配
This commit is contained in:
parent
f9c551ba6a
commit
550ac11789
@ -249,7 +249,7 @@ class ServerResourceController extends Controller
|
|||||||
$server = ServerResource::query()->findOrFail($id);
|
$server = ServerResource::query()->findOrFail($id);
|
||||||
$assignedOnly = $request->boolean('assigned_only', false);
|
$assignedOnly = $request->boolean('assigned_only', false);
|
||||||
|
|
||||||
$users = User::query()->select(['id', 'nickname', 'email'])->with(['serverResources' => function ($query) use ($id) {
|
$users = User::query()->select(['id', 'nickname', 'email', 'phone'])->with(['serverResources' => function ($query) use ($id) {
|
||||||
$query->where('server_resource_id', $id);
|
$query->where('server_resource_id', $id);
|
||||||
}])->orderBy('id')->get()->map(function (User $user) {
|
}])->orderBy('id')->get()->map(function (User $user) {
|
||||||
$pivot = $user->serverResources->first()?->pivot;
|
$pivot = $user->serverResources->first()?->pivot;
|
||||||
@ -258,6 +258,7 @@ class ServerResourceController extends Controller
|
|||||||
'id' => $user->id,
|
'id' => $user->id,
|
||||||
'nickname' => $user->nickname,
|
'nickname' => $user->nickname,
|
||||||
'email' => $user->email,
|
'email' => $user->email,
|
||||||
|
'phone' => $user->phone,
|
||||||
'can_ssh' => (bool) ($pivot->can_ssh ?? false),
|
'can_ssh' => (bool) ($pivot->can_ssh ?? false),
|
||||||
'can_sftp' => (bool) ($pivot->can_sftp ?? false),
|
'can_sftp' => (bool) ($pivot->can_sftp ?? false),
|
||||||
'can_rdp' => (bool) ($pivot->can_rdp ?? false),
|
'can_rdp' => (bool) ($pivot->can_rdp ?? false),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user