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
2017-03-13 16:47:50 +08:00
parent 75beb3f424
commit a7cdc2b126
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ trait SoftDelete
{
$model = new static();
$field = $model->getDeleteTimeField(true);
return $model->db(false)->removeWhereField($field);
return $model->db(false);
}
/**
@@ -42,7 +42,7 @@ trait SoftDelete
{
$model = new static();
$field = $model->getDeleteTimeField(true);
return $model->db(false)->whereNotNull($field);
return $model->db(false)->useSoftDelete($field, ['not null', '']);
}
/**
@@ -112,12 +112,11 @@ trait SoftDelete
{
$name = $this->getDeleteTimeField();
if (empty($where)) {
$pk = $this->getPk();
$where[$pk] = $this->getData($pk);
$where[$name] = ['not null', ''];
$pk = $this->getPk();
$where[$pk] = $this->getData($pk);
}
// 恢复删除
return $this->db(false)->removeWhereField($this->getDeleteTimeField(true))->where($where)->update([$name => null]);
return $this->db(false)->useSoftDelete($name, ['not null', ''])->where($where)->update([$name => null]);
}
/**
@@ -129,7 +128,7 @@ trait SoftDelete
protected function base($query)
{
$field = $this->getDeleteTimeField(true);
$query->whereNull($field);
$query->useSoftDelete($field);
}
/**