From 26482e4ed020e4f3a1a2e650d6bab259a3f871cf Mon Sep 17 00:00:00 2001 From: thinkphp Date: Tue, 5 Sep 2017 10:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/traits/model/SoftDelete.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/traits/model/SoftDelete.php b/library/traits/model/SoftDelete.php index 65dcef48..d38743f6 100644 --- a/library/traits/model/SoftDelete.php +++ b/library/traits/model/SoftDelete.php @@ -65,7 +65,6 @@ trait SoftDelete } else { // 删除条件 $where = $this->getWhere(); - // 删除当前模型数据 $result = $this->getQuery()->where($where)->delete(); } @@ -76,7 +75,7 @@ trait SoftDelete $name = is_numeric($key) ? $name : $key; $model = $this->getAttr($name); if ($model instanceof Model) { - $model->delete(); + $model->delete($force); } } }