From a186eacc8f886dcc56aab91e3ad6256312d7a5b7 Mon Sep 17 00:00:00 2001
From: yanwenwu <njphper@gmail.com>
Date: Thu, 22 Nov 2018 09:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Role.php                      | 5 ++---
 application/model/{AbstractBaseModel.php => BaseModel.php} | 2 +-
 application/model/UserModel.php                            | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename application/model/{AbstractBaseModel.php => BaseModel.php} (95%)

diff --git a/application/admin/controller/Role.php b/application/admin/controller/Role.php
index f70b104..4f5071c 100644
--- a/application/admin/controller/Role.php
+++ b/application/admin/controller/Role.php
@@ -1,6 +1,7 @@
 <?php
 namespace app\admin\controller;
 
+use think\Exception;
 use think\permissions\facade\Roles;
 use app\validates\RoleValidate;
 use think\permissions\facade\Permissions;
@@ -47,10 +48,8 @@ class Role extends Base
 		    }
     		Roles::updateBy($data['id'], $data) !== false ? $this->success('编辑成功', url('role/index')) : $this->error('编辑失败');
 	    }
-	    $roleId = $this->request->param('id');
-    	$role = Roles::getRoleBy($roleId);
 
-    	$this->role = $role;
+    	$this->role = Roles::getRoleBy($this->request->param('id'));
         return $this->fetch();
     }
 
diff --git a/application/model/AbstractBaseModel.php b/application/model/BaseModel.php
similarity index 95%
rename from application/model/AbstractBaseModel.php
rename to application/model/BaseModel.php
index 8115a73..41415b5 100644
--- a/application/model/AbstractBaseModel.php
+++ b/application/model/BaseModel.php
@@ -9,7 +9,7 @@ namespace app\model;
 
 use think\Model;
 
-abstract class AbstractBaseModel extends Model
+class BaseModel extends Model
 {
 	const LIMIT  = 20;
 
diff --git a/application/model/UserModel.php b/application/model/UserModel.php
index 5699611..d71e1a9 100644
--- a/application/model/UserModel.php
+++ b/application/model/UserModel.php
@@ -4,7 +4,7 @@ namespace app\model;
 
 use think\permissions\traits\hasRoles;
 
-class UserModel extends AbstractBaseModel
+class UserModel extends BaseModel
 {
 	use hasRoles;