fix: 角色权限分配

This commit is contained in:
JaguarJack 2023-04-20 10:28:40 +08:00
parent c5c87b7f63
commit eb8525b352
4 changed files with 6 additions and 13 deletions

View File

@ -57,7 +57,7 @@ class RolesController extends Controller
{
$role = $this->model->firstBy($id);
$role->setAttribute('permissions', $role->permissions()->get()->toTree());
$role->setAttribute('permissions', $role->permissions()->get()->pluck('id'));
$role->setAttribute('departments', $role->departments()->pluck('id'));
@ -72,13 +72,13 @@ class RolesController extends Controller
*/
public function update($id, RoleRequest $request)
{
$dataRange = $request->get('data_range');
$data = $request->all();
if ($dataRange && ! DataRange::Personal_Choose->assert($request->get('data_range'))) {
$request['departments'] = [];
if ($request->get('data_range') && ! DataRange::Personal_Choose->assert($data['data_range'])) {
$data['departments'] = [];
}
return $this->model->updateBy($id, $request->all());
return $this->model->updateBy($id,$data);
}
/**

View File

@ -1,4 +0,0 @@
<?php
return [
'is_ok' => true
];

View File

@ -1,4 +0,0 @@
<?php
return [
'is_ok' => true
];

View File

@ -193,6 +193,7 @@ beforeUpdate.value = () => {
formData.value.permissions.forEach(item => {
permissionIds.push(item)
})
formData.value.permissions = permissionIds
formData.value.parent_id = getParent(formData.value.parent_id)
}