更新内核,API接口开发的一些尝试,后期会增加API接口开发这块
This commit is contained in:
@@ -30,7 +30,7 @@ trait SoftDelete
|
||||
{
|
||||
$model = new static();
|
||||
$field = $model->getDeleteTimeField(true);
|
||||
return $model->db(false);
|
||||
return $model->getQuery();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -42,7 +42,7 @@ trait SoftDelete
|
||||
{
|
||||
$model = new static();
|
||||
$field = $model->getDeleteTimeField(true);
|
||||
return $model->db(false)
|
||||
return $model->getQuery()
|
||||
->useSoftDelete($field, ['not null', '']);
|
||||
}
|
||||
|
||||
@@ -60,11 +60,10 @@ trait SoftDelete
|
||||
$name = $this->getDeleteTimeField();
|
||||
if (!$force) {
|
||||
// 软删除
|
||||
$this->change[] = $name;
|
||||
$this->data[$name] = $this->autoWriteTimestamp($name);
|
||||
$result = $this->isUpdate()->save();
|
||||
} else {
|
||||
$result = $this->db(false)->delete($this->data);
|
||||
$result = $this->getQuery()->delete($this->data);
|
||||
}
|
||||
|
||||
$this->trigger('after_delete', $this);
|
||||
@@ -117,7 +116,7 @@ trait SoftDelete
|
||||
$where[$pk] = $this->getData($pk);
|
||||
}
|
||||
// 恢复删除
|
||||
return $this->db(false)
|
||||
return $this->getQuery()
|
||||
->useSoftDelete($name, ['not null', ''])
|
||||
->where($where)
|
||||
->update([$name => null]);
|
||||
@@ -143,7 +142,7 @@ trait SoftDelete
|
||||
*/
|
||||
protected function getDeleteTimeField($read = false)
|
||||
{
|
||||
$field = isset($this->deleteTime) ? $this->deleteTime : 'delete_time';
|
||||
$field = property_exists($this, 'deleteTime') && isset($this->deleteTime) ? $this->deleteTime : 'delete_time';
|
||||
if (!strpos($field, '.')) {
|
||||
$field = '__TABLE__.' . $field;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user