From e550b327ddc1d6ae2c1126490dcb5c811978624a Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Fri, 18 Sep 2020 17:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=9A=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=20=E4=BC=98=E5=8C=96=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E8=B5=84=E6=96=99=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=9F=BA=E7=B1=BB=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/general/Profile.php |  4 ++--
 application/admin/view/user/user/index.html      |  6 +++---
 application/common/controller/Backend.php        | 13 ++++++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

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 @@
                             </ul>
                         </div>
                     </div>
-                    <table id="table" class="table table-striped table-bordered table-hover" 
-                           data-operate-edit="{:$auth->check('user/user/edit')}" 
-                           data-operate-del="{:$auth->check('user/user/del')}" 
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('user/user/edit')}"
+                           data-operate-del="{:$auth->check('user/user/del')}"
                            width="100%">
                     </table>
                 </div>
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);