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 @@ 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;