This commit is contained in:
thinkphp
2016-08-20 22:04:39 +08:00
parent 2b4a15ed49
commit 6622c9698d

View File

@@ -106,7 +106,7 @@ trait SoftDelete
// 恢复删除 // 恢复删除
$name = static::$deleteTime; $name = static::$deleteTime;
$this->change[] = $name; $this->change[] = $name;
$this->data[$name] = ['exp', 'null']; $this->data[$name] = null;
return $this->isUpdate()->save(); return $this->isUpdate()->save();
} }
return false; return false;
@@ -120,7 +120,7 @@ trait SoftDelete
protected static function base($query) protected static function base($query)
{ {
if (static::$deleteTime) { if (static::$deleteTime) {
$query->where(static::$deleteTime, 'exp', 'is null'); $query->where(static::$deleteTime, 'null');
} }
} }