diff --git a/catch/permissions/database/migrations/20200830025329_update_roles.php b/catch/permissions/database/migrations/20200830025329_update_roles.php index ddeaed1..28face9 100644 --- a/catch/permissions/database/migrations/20200830025329_update_roles.php +++ b/catch/permissions/database/migrations/20200830025329_update_roles.php @@ -31,7 +31,7 @@ class UpdateRoles extends Migrator if ($this->hasTable('roles')) { $table = $this->table('roles'); - $table->addColumn('identifies', 'string', [ + $table->addColumn('identify', 'string', [ 'limit' => 20, 'default' => 1, 'comment' => '角色的标识,用英文表示,用于后台路由权限', diff --git a/catch/permissions/model/Department.php b/catch/permissions/model/Department.php index 0dd0ddd..7c84adc 100644 --- a/catch/permissions/model/Department.php +++ b/catch/permissions/model/Department.php @@ -35,9 +35,7 @@ class Department extends CatchModel */ public function getList(): array { - return $this->withoutField(['department_name']) - ->addFields(['department_name as title']) - ->catchSearch() + return $this->catchSearch() ->catchOrder() ->select()->toArray(); }