From 4a2eb296b29e9ff04f464751555d2f73515924ae Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 30 Sep 2016 14:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=BD=AF=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84base=E6=96=B9=E6=B3=95=20=E5=A2=9E=E5=8A=A0tableAlias?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E5=B1=9E=E6=80=A7=E5=AE=9A=E4=B9=89=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=A8=A1=E5=9E=8B=E7=9A=84=E8=A1=A8=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/traits/model/SoftDelete.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/library/traits/model/SoftDelete.php b/library/traits/model/SoftDelete.php
index 3189a95e..eed8c302 100644
--- a/library/traits/model/SoftDelete.php
+++ b/library/traits/model/SoftDelete.php
@@ -123,8 +123,10 @@ trait SoftDelete
     protected static function base($query)
     {
         if (static::$deleteTime) {
-            $table = $query->getTable();
-            $query->where($table . '.' . static::$deleteTime, 'null');
+            $query->where(static::$tableAlias ?
+                static::$tableAlias . '.' . static::$deleteTime :
+                static::$deleteTime,
+                'null');
         }
     }