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

update:更新权限方法

Browse Source
This commit is contained in:
JaguarJack
2020-07-24 21:40:26 +08:00
parent 8d21dc8acc
commit c65863d606
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
catch/permissions/controller/Role.php
View File

@@ -42,7 +42,7 @@ class Role extends CatchController
$permissions = $request->param('permissions');
if (!empty($permissions)) {
$this->role->attach(array_unique($permissions));
$this->role->attachPermissions(array_unique($permissions));
}
if (!empty($request->param('departments'))) {
$this->role->attachDepartments($request->param('departments'));
@@ -88,10 +88,10 @@ class Role extends CatchController
$detachIds = array_diff($hasPermissionIds, $existedPermissionIds);
if (!empty($detachIds)) {
$role->detach($detachIds);
$role->detachPermissions($detachIds);
}
if (!empty($attachIds)) {
$role->attach(array_unique($attachIds));
$role->attachPermissions(array_unique($attachIds));
}
// 更新department
@@ -136,7 +136,7 @@ class Role extends CatchController
}
$role = $this->role->findBy($id);
// 删除权限
$role->detach();
$role->detachPermissions();
// 删除部门关联
$role->detachDepartments();
// 删除用户关联

8
catch/permissions/controller/User.php
View File

@@ -84,7 +84,7 @@ class User extends CatchController
{
$this->user->storeBy($request->param());
$this->user->attach($request->param('roles'));
$this->user->attachRoles($request->param('roles'));
$this->user->attachJobs($request->param('jobs'));
@@ -124,11 +124,11 @@ class User extends CatchController
$user = $this->user->findBy($id);
$user->detach();
$user->detachRoles();
$user->detachJobs();
if (!empty($request->param('roles'))) {
$user->attach($request->param('roles'));
$user->attachRoles($request->param('roles'));
}
if (!empty($request->param('jobs'))) {
$user->attachJobs($request->param('jobs'));
@@ -149,7 +149,7 @@ class User extends CatchController
foreach ($ids as $_id) {
$user = $this->user->findBy($_id);
// 删除角色
$user->detach();
$user->detachRoles();
// 删除岗位
$user->detachJobs();