From acbd5b97fece8b5cb5b95ab4fc459eb9012bcb32 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 13 Sep 2016 11:02:05 +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=84destory=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/traits/model/SoftDelete.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/traits/model/SoftDelete.php b/library/traits/model/SoftDelete.php
index 621cc8ce..0d0e3d18 100644
--- a/library/traits/model/SoftDelete.php
+++ b/library/traits/model/SoftDelete.php
@@ -83,7 +83,10 @@ trait SoftDelete
         } elseif ($data instanceof \Closure) {
             call_user_func_array($data, [ & $query]);
             $data = null;
+        } elseif (is_null($data)) {
+            return 0;
         }
+
         $resultSet = $query->select($data);
         $count     = 0;
         if ($resultSet) {