0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 角色权限分配

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/Permissions/Http/Controllers/RolesController.php
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);
}
/**