diff --git a/modules/Permissions/Http/Controllers/RolesController.php b/modules/Permissions/Http/Controllers/RolesController.php index b5084c7..24dd228 100644 --- a/modules/Permissions/Http/Controllers/RolesController.php +++ b/modules/Permissions/Http/Controllers/RolesController.php @@ -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); } /** diff --git a/modules/Permissions/config/ok.php b/modules/Permissions/config/ok.php deleted file mode 100644 index 5d27f3e..0000000 --- a/modules/Permissions/config/ok.php +++ /dev/null @@ -1,4 +0,0 @@ - true -]; diff --git a/modules/Permissions/config/oks.php b/modules/Permissions/config/oks.php deleted file mode 100644 index 5d27f3e..0000000 --- a/modules/Permissions/config/oks.php +++ /dev/null @@ -1,4 +0,0 @@ - true -]; diff --git a/modules/Permissions/views/roles/form/create.vue b/modules/Permissions/views/roles/form/create.vue index 4f668bf..e4e0840 100644 --- a/modules/Permissions/views/roles/form/create.vue +++ b/modules/Permissions/views/roles/form/create.vue @@ -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) }