From 919e740073a182545a6211fd1e2735047a1830fd Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Tue, 4 Mar 2025 09:46:57 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A7=92=E8=89=B2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E7=B3=BB=E7=BB=9F=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/v1/Role.php | 4 ++++ app/common/model/SysRoleBaseModel.php | 1 + database/migrations/20241230062221_create_sys_role.php | 1 + 3 files changed, 6 insertions(+) diff --git a/app/admin/controller/v1/Role.php b/app/admin/controller/v1/Role.php index d478207b..84602676 100644 --- a/app/admin/controller/v1/Role.php +++ b/app/admin/controller/v1/Role.php @@ -227,6 +227,10 @@ class Role return error('请确认要操作对象是否存在'); } + if (1 == $role->is_system) { + return error('该角色禁止删除'); + } + if (!$role->delete()) { return error('操作失败'); } diff --git a/app/common/model/SysRoleBaseModel.php b/app/common/model/SysRoleBaseModel.php index 43e8179c..bfb359da 100644 --- a/app/common/model/SysRoleBaseModel.php +++ b/app/common/model/SysRoleBaseModel.php @@ -21,6 +21,7 @@ class SysRoleBaseModel extends BaseModel 'pid' => 'int', 'name' => 'string', 'desc' => 'string', + 'is_system' => 'int', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', diff --git a/database/migrations/20241230062221_create_sys_role.php b/database/migrations/20241230062221_create_sys_role.php index 603120fd..ccbc52fd 100644 --- a/database/migrations/20241230062221_create_sys_role.php +++ b/database/migrations/20241230062221_create_sys_role.php @@ -31,6 +31,7 @@ class CreateSysRole extends Migrator $table->addColumn('pid', 'integer', ['null' => false, 'default' => 0, 'comment' => '父级ID']) ->addColumn('name', 'string', ['limit' => 64, 'null' => false, 'comment' => '角色名称']) ->addColumn('desc', 'string', ['limit' => 255, 'null' => false, 'comment' => '角色描述']) + ->addColumn('is_system', 'boolean', ['null' => false, 'limit' => 1, 'default' => 0, 'comment' => '是否系统角色:1为是,0为否']) ->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP', 'comment' => '创建时间']) ->addColumn('updated_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', 'comment' => '更新时间']) ->addColumn('deleted_at', 'timestamp', ['null' => true, 'default' => null, 'comment' => '删除时间'])