diff --git a/catch/permissions/database/migrations/20200830031139_update_permissions.php b/catch/permissions/database/migrations/20200830031139_update_permissions.php index 8998d63..23db89d 100644 --- a/catch/permissions/database/migrations/20200830031139_update_permissions.php +++ b/catch/permissions/database/migrations/20200830031139_update_permissions.php @@ -31,13 +31,9 @@ class UpdatePermissions extends Migrator if ($this->hasTable('permissions')) { $table = $this->table('permissions'); - $table->renameColumn('method', 'hidden_children_in_menu', 'status') - ->addColumn('hidden', 'integer', [ - 'limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY, - 'default' => 1, - 'comment' => '是否在侧边栏隐藏 1 显示 2 隐藏', - 'after' => 'redirect']) - ->update(); + $table->removeColumn('method') + ->removeColumn('hide_children_in_menu') + ->update(); } } } diff --git a/catch/permissions/model/Permissions.php b/catch/permissions/model/Permissions.php index e038200..edd7834 100644 --- a/catch/permissions/model/Permissions.php +++ b/catch/permissions/model/Permissions.php @@ -19,12 +19,10 @@ class Permissions extends CatchModel 'component', // 组件 'redirect', 'keepalive', - 'hide_children_in_menu', 'creator_id', 'status', 'module', // 模块 'route', // 路由 - 'method', // 请求方法 'permission_mark', // 权限标识 'type', // 1 菜单 2 按钮 'sort', // 排序字段 diff --git a/catch/permissions/model/Roles.php b/catch/permissions/model/Roles.php index 8c59b10..85350d3 100644 --- a/catch/permissions/model/Roles.php +++ b/catch/permissions/model/Roles.php @@ -21,6 +21,7 @@ class Roles extends CatchModel protected $field = [ 'id', // 'role_name', // 角色名 + 'identify', // 身份标识 'parent_id', // 父级ID 'creator_id', // 创建者 'data_range', // 数据范围