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-09-08 16:25:36 +08:00
parent d75c455bdc
commit 61b9a07d99
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
namespace catchAdmin\permissions\controller; namespace catchAdmin\permissions\controller;
use catchAdmin\permissions\model\Permissions; use catchAdmin\permissions\model\Permissions;
use catchAdmin\permissions\model\Roles;
use catcher\base\CatchRequest as Request; use catcher\base\CatchRequest as Request;
use catcher\base\CatchController; use catcher\base\CatchController;
use catcher\CatchResponse; use catcher\CatchResponse;
@ -38,14 +39,19 @@ class Role extends CatchController
*/ */
public function save(Request $request) public function save(Request $request)
{ {
$this->role->storeBy($request->param()); $params = $request->param();
$permissions = $request->param('permissions'); if (Roles::where('identify', $params['identify'])->find()) {
throw new FailedException('角色标识 [' . $params['identify'] . ']已存在');
}
$this->role->storeBy($params);
$permissions = $params['permissions'];
if (!empty($permissions)) { if (!empty($permissions)) {
$this->role->attachPermissions(array_unique($permissions)); $this->role->attachPermissions(array_unique($permissions));
} }
if (!empty($request->param('departments'))) { if (!empty($params['permissions'])) {
$this->role->attachDepartments($request->param('departments')); $this->role->attachDepartments($params['permissions']);
} }
// 添加角色 // 添加角色
return CatchResponse::success(); return CatchResponse::success();
@ -69,6 +75,10 @@ class Role extends CatchController
*/ */
public function update($id, Request $request): Json public function update($id, Request $request): Json
{ {
if (Roles::where('identify', $request->param('identify'))->where('id', '<>', $id)->find()) {
throw new FailedException('角色标识 [' . $request->param('identify') . ']已存在');
}
$this->role->updateBy($id, $request->param()); $this->role->updateBy($id, $request->param());
$role = $this->role->findBy($id); $role = $this->role->findBy($id);