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-05-29 15:40:19 +08:00
parent a6c879ce09
commit be1307db94
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/User/Models/Traits/UserRelations.php
View File

@ -58,16 +58,16 @@ trait UserRelations
/* @var Permissions $permissionsModel */ /* @var Permissions $permissionsModel */
$permissionsModel = app($this->getPermissionsModel()); $permissionsModel = app($this->getPermissionsModel());
if ($this->isSuperAdmin()) { if ($this->isSuperAdmin()) {
$permissions = $permissionsModel->get(); $permissions = $permissionsModel->get();
} else { } else {
$permissions = Collection::make(); $permissionIds = Collection::make();
$this->roles()->with('permissions')->get() $this->roles()->with('permissions')->get()
->each(function ($role) use (&$permissions) { ->each(function ($role) use (&$permissionIds) {
$permissions = $permissions->concat($role->permissions); $permissionIds = $permissionIds->concat($role->permissions?->pluck('id'));
}); });
$permissions = $permissions->unique();
$permissions = $permissionsModel->whereIn('id', $permissionIds->unique())->get();
} }
$this->setAttribute('permissions', $permissions->each(fn ($permission) => $permission->setAttribute('hidden', $permission->isHidden()))); $this->setAttribute('permissions', $permissions->each(fn ($permission) => $permission->setAttribute('hidden', $permission->isHidden())));

2
modules/User/Models/User.php
View File

@ -99,7 +99,7 @@ class User extends Model implements AuthenticatableContract
if (empty($data['password'])) { if (empty($data['password'])) {
unset($data['password']); unset($data['password']);
} }
return parent::updateBy($id, $data); return parent::updateBy($id, $data);
} }
} }