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

改进软删除的兼容性

Browse Source
This commit is contained in:
thinkphp
2017-02-06 14:07:12 +08:00
parent 0b8d05efdb
commit 002cd48d54
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

@@ -42,7 +42,7 @@ trait SoftDelete
{ {
$model = new static(); $model = new static();
$field = $model->getDeleteTimeField(true); $field = $model->getDeleteTimeField(true);
return $model->db(false)->where($field, 'exp', 'is not null'); return $model->db(false)->whereNotNull($field);
} }
/** /**
@@ -129,7 +129,7 @@ trait SoftDelete
protected function base($query) protected function base($query)
{ {
$field = $this->getDeleteTimeField(true); $field = $this->getDeleteTimeField(true);
$query->where($field, 'null'); $query->whereNull($field);
} }
/** /**