From b061ab52252629dde31262d5c75b3bb5b79f85d9 Mon Sep 17 00:00:00 2001 From: wuyanwen Date: Sun, 29 Dec 2019 17:01:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/migrations/20191208125726_permissions.php | 1 + catch/permissions/model/Permissions.php | 4 ++-- .../system/database/migrations/20191212110930_operate_log.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/catch/permissions/database/migrations/20191208125726_permissions.php b/catch/permissions/database/migrations/20191208125726_permissions.php index 50a6fbe..d57d0f0 100644 --- a/catch/permissions/database/migrations/20191208125726_permissions.php +++ b/catch/permissions/database/migrations/20191208125726_permissions.php @@ -32,6 +32,7 @@ class Permissions extends Migrator $table->addColumn('permission_name', 'string',['limit' => 15,'default'=>'','comment'=>'菜单名称']) ->addColumn('parent_id', 'integer',['default'=>0,'comment'=>'父级ID', 'signed' => false]) ->addColumn('route', 'string', ['default' => '', 'comment' => '路由', 'limit' => 50]) + ->addColumn('icon', 'string', ['default' => '', 'comment' => '菜单图标', 'limit' => 50]) ->addColumn('module', 'string', ['default' => '', 'comment' => '模块', 'limit' => 20]) ->addColumn('method', 'string', ['default' => 'get', 'comment' => '路由请求方法', 'limit' => 15]) ->addColumn('permission_mark', 'string', ['null' => false, 'comment' => '权限标识', 'limit' => 50]) diff --git a/catch/permissions/model/Permissions.php b/catch/permissions/model/Permissions.php index b4b09c0..cd0c754 100644 --- a/catch/permissions/model/Permissions.php +++ b/catch/permissions/model/Permissions.php @@ -34,8 +34,8 @@ class Permissions extends CatchModel public function getList($search = []) { - return $this->when($search['name'] ?? false, function ($query) use ($search){ - $query->whereLike('name', $search['name']); + return $this->when($search['permission_name'] ?? false, function ($query) use ($search){ + $query->whereLike('permission_name', '%'.$search['permission_name'].'%'); }) ->when($search['id'] ?? false, function ($query) use ($search){ $query->where('parent_id', $search['id']) diff --git a/catch/system/database/migrations/20191212110930_operate_log.php b/catch/system/database/migrations/20191212110930_operate_log.php index 0fb31db..e445ec0 100644 --- a/catch/system/database/migrations/20191212110930_operate_log.php +++ b/catch/system/database/migrations/20191212110930_operate_log.php @@ -31,7 +31,7 @@ class OperateLog extends Migrator $table = $this->table('operate_log',['engine'=>'Myisam', 'comment' => '操作日志', 'signed' => false]); $table->addColumn('module', 'string',['limit' => 50,'default'=>'','comment'=>'模块名称']) ->addColumn('operate', 'string',['default'=> '', 'limit' => 20, 'comment'=>'操作模块']) - ->addColumn('route', 'string',['default'=> '','limit' => 20, 'comment'=>'路由']) + ->addColumn('route', 'string',['default'=> '','limit' => 100, 'comment'=>'路由']) ->addColumn('params', 'string',['default'=> '','limit' => 1000, 'comment'=>'参数']) ->addColumn('ip', 'string',['default'=>'', 'limit' => 20,'comment'=>'ip', 'signed' => false]) ->addColumn('creator_id', 'integer',['default'=> 0,'comment'=>'创建人ID', 'signed' => false])