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

fixed: 超管角色返回全部权限

Browse Source
This commit is contained in:
JaguarJack 2021-08-31 14:16:13 +08:00
parent c5164e25e9
commit 3728bd2068
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ use catcher\base\CatchRequest as Request;
use catcher\base\CatchController; use catcher\base\CatchController;
use catcher\CatchResponse; use catcher\CatchResponse;
use catcher\exceptions\FailedException; use catcher\exceptions\FailedException;
use catcher\Utils;
use think\response\Json; use think\response\Json;
use catchAdmin\permissions\model\Roles as RoleModel; use catchAdmin\permissions\model\Roles as RoleModel;
@ -163,9 +164,16 @@ class Role extends CatchController
* @time 2021年07月29日 * @time 2021年07月29日
* @param $id * @param $id
* @return Json * @return Json
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\db\exception\DataNotFoundException
*/ */
public function getPermissions($id): Json public function getPermissions($id): Json
{ {
if (Utils::isSuperAdmin()) {
return CatchResponse::success(Permissions::field(['id', 'parent_id', 'permission_name'])->select()->toTree());
}
return CatchResponse::success( return CatchResponse::success(
Permissions::whereIn('id', $this->role->findBy($id)->getPermissions()->column('id')) Permissions::whereIn('id', $this->role->findBy($id)->getPermissions()->column('id'))
->field(['id', 'parent_id', 'permission_name']) ->field(['id', 'parent_id', 'permission_name'])