diff --git a/src/plugin/admin/app/controller/RoleController.php b/src/plugin/admin/app/controller/RoleController.php index 3379b53..f5574f2 100644 --- a/src/plugin/admin/app/controller/RoleController.php +++ b/src/plugin/admin/app/controller/RoleController.php @@ -43,7 +43,12 @@ class RoleController extends Crud public function insert(Request $request): Response { if ($request->method() === 'POST') { - return parent::insert($request); + $data = $this->insertInput($request); + if (isset($data['pid']) && $data['pid'] == 0) { + return $this->json(1, '请选择父级权限组'); + } + $id = $this->doInsert($data); + return $this->json(0, 'ok', ['id' => $id]); } return view('role/insert'); } @@ -68,6 +73,14 @@ class RoleController extends Crud if (isset($data['pid']) && $id == 1) { $data['pid'] = 0; } + if (isset($data['pid'])) { + if ($data['pid'] == $id) { + return $this->json(1, '父集不能是自己'); + } + if ($data['pid'] == 0) { + return $this->json(1, '请选择父级权限组'); + } + } $this->doUpdate($id, $data); return $this->json(0); } diff --git a/src/plugin/admin/app/view/role/index.html b/src/plugin/admin/app/view/role/index.html index e4a4a1b..bc62ab4 100644 --- a/src/plugin/admin/app/view/role/index.html +++ b/src/plugin/admin/app/view/role/index.html @@ -31,8 +31,10 @@ @@ -66,7 +68,7 @@ title: "主键", field: "id", },{ - title: "角色名", + title: "角色组", field: "name", },{ title: "权限", @@ -79,7 +81,8 @@ items.push(apiResults[field][v] || v); }); return util.escape(items.join(",")); - } + }, + hide: true, },{ title: "创建时间", field: "created_at", @@ -87,7 +90,7 @@ title: "更新时间", field: "updated_at", },{ - title: "上级id", + title: "父级", field: "pid", templet: function (d) { let field = "pid"; @@ -97,7 +100,8 @@ items.push(apiResults[field][v] || v); }); return util.escape(items.join(",")); - } + }, + hide: true, },{ title: "操作", toolbar: "#table-bar", diff --git a/src/plugin/admin/app/view/role/insert.html b/src/plugin/admin/app/view/role/insert.html index e938f38..93b96a5 100644 --- a/src/plugin/admin/app/view/role/insert.html +++ b/src/plugin/admin/app/view/role/insert.html @@ -12,7 +12,14 @@