2 Commits

Author SHA1 Message Date
919e740073 refactor: 角色添加是否系统角色字段相关逻辑 2025-03-04 09:46:57 +08:00
c7e1cc5bed refactor: 修改用户分页接口 2025-03-04 09:39:43 +08:00
4 changed files with 7 additions and 1 deletions

View File

@@ -227,6 +227,10 @@ class Role
return error('请确认要操作对象是否存在');
}
if (1 == $role->is_system) {
return error('该角色禁止删除');
}
if (!$role->delete()) {
return error('操作失败');
}

View File

@@ -123,7 +123,7 @@ class User
})
->column([
'ip',
'max(created_at)' => 'created_at'
'created_at'
], 'user_id');
if (!empty($logs)) {
$users->each(function($item) use($logs) {

View File

@@ -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',

View File

@@ -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' => '删除时间'])