diff --git a/app/admin/controller/system/Admin.php b/app/admin/controller/system/Admin.php index 56a6069..12c4ecd 100644 --- a/app/admin/controller/system/Admin.php +++ b/app/admin/controller/system/Admin.php @@ -40,11 +40,10 @@ class Admin extends AdminController { parent::__construct($app); $this->model = new SystemAdmin(); - $this->assign('auth_list', $this->model->getAuthList(),true); - - $this->dataBrage['count'] = 10; - $this->dataBrage['tips'] = '请谨慎操作'; + $this->assign('auth_list', $this->model->getAuthList(), true); + $this->setDataBrage('count', 10); + $this->setDataBrage('tips', '请谨慎操作'); } /** @@ -168,8 +167,8 @@ class Admin extends AdminController $row = $this->model->whereIn('id', $id)->select(); $row->isEmpty() && $this->error('数据不存在'); $id == AdminConstant::SUPER_ADMIN_ID && $this->error('超级管理员不允许修改'); - if (is_array($id)){ - if (in_array(AdminConstant::SUPER_ADMIN_ID, $id)){ + if (is_array($id)) { + if (in_array(AdminConstant::SUPER_ADMIN_ID, $id)) { $this->error('超级管理员不允许修改'); } } @@ -211,6 +210,4 @@ class Admin extends AdminController } $this->success('保存成功'); } - - } diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php index 643efc2..d5df7a2 100644 --- a/app/common/controller/AdminController.php +++ b/app/common/controller/AdminController.php @@ -95,7 +95,7 @@ class AdminController extends BaseController * * @var array */ - protected $dataBrage = []; + private $dataBrage = []; /** @@ -140,6 +140,20 @@ class AdminController extends BaseController return $this->app->view->fetch($template, $vars); } + /** + * 设置dataBrage数据 + * + * @param string $name + * @param mixed $value + * @return void + */ + public function setDataBrage($name, $value) + { + $this->dataBrage[$name] = $value; + + return $this; + } + /** * 重写验证规则 * @param array $data