diff --git a/application/admin/controller/general/Profile.php b/application/admin/controller/general/Profile.php
index 9cc6c538..10fc51f6 100644
--- a/application/admin/controller/general/Profile.php
+++ b/application/admin/controller/general/Profile.php
@@ -24,10 +24,10 @@ class Profile extends Backend
//设置过滤方法
$this->request->filter(['strip_tags', 'trim']);
if ($this->request->isAjax()) {
- $model = model('AdminLog');
+ $this->model = model('AdminLog');
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
- $list = $model
+ $list = $this->model
->where($where)
->where('admin_id', $this->auth->id)
->order($sort, $order)
diff --git a/application/admin/view/user/user/index.html b/application/admin/view/user/user/index.html
index 00308e8d..91e17635 100644
--- a/application/admin/view/user/user/index.html
+++ b/application/admin/view/user/user/index.html
@@ -15,9 +15,9 @@
-
diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 254c346c..413741aa 100644
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -388,7 +388,7 @@ class Backend extends Controller
$arr = $arr[0];
}
$tableArr = explode('.', $k);
- if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias)) {
+ if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias) && !empty($this->model)) {
//修复关联模型下时间无法搜索的BUG
$relation = Loader::parseName($tableArr[0], 1, false);
$alias[$this->model->$relation()->getTable()] = $tableArr[0];
@@ -406,12 +406,15 @@ class Backend extends Controller
}
$index++;
}
-
- $this->model->alias($alias);
+ if (!empty($this->model)) {
+ $this->model->alias($alias);
+ }
$model = $this->model;
$where = function ($query) use ($where, $alias, $bind, &$model) {
- $model->alias($alias);
- $model->bind($bind);
+ if (!empty($model)) {
+ $model->alias($alias);
+ $model->bind($bind);
+ }
foreach ($where as $k => $v) {
if (is_array($v)) {
call_user_func_array([$query, 'where'], $v);