mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进

Browse Source
This commit is contained in:
thinkphp
2016-08-20 22:04:39 +08:00
parent 2b4a15ed49
commit 6622c9698d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/traits/model/SoftDelete.php
View File

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