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 2024-04-23 17:47:49 +08:00
parent 1d694a81c5
commit 72c68507e5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/Permissions/Http/Controllers/PermissionsController.php
View File

@ -34,7 +34,7 @@ class PermissionsController extends Controller
} }
return $this->model->setBeforeGetList(function ($query) { return $this->model->setBeforeGetList(function ($query) {
return $query->with('actions')->whereIn('type', [MenuType::Top->value(), MenuType::Menu->value()]); return $query->with('actions')->whereIn('type', [MenuType::Top->value(), MenuType::Menu->value()])->orderByDesc('sort');
})->getList(); })->getList();
} }

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

@ -59,7 +59,7 @@ 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->orderByDesc('sort')->get();
} else { } else {
$permissionIds = Collection::make(); $permissionIds = Collection::make();
$this->roles()->with('permissions')->get() $this->roles()->with('permissions')->get()
@ -67,7 +67,7 @@ trait UserRelations
$permissionIds = $permissionIds->concat($role->permissions?->pluck('id')); $permissionIds = $permissionIds->concat($role->permissions?->pluck('id'));
}); });
$permissions = $permissionsModel->whereIn('id', $permissionIds->unique())->get(); $permissions = $permissionsModel->whereIn('id', $permissionIds->unique())->orderByDesc('sort')->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())));