diff --git a/library/traits/model/SoftDelete.php b/library/traits/model/SoftDelete.php index 281c26c9..1a69c2c5 100644 --- a/library/traits/model/SoftDelete.php +++ b/library/traits/model/SoftDelete.php @@ -2,6 +2,8 @@ namespace traits\model; +use think\db\Query; + trait SoftDelete { @@ -22,7 +24,7 @@ trait SoftDelete /** * 查询软删除数据 * @access public - * @return \think\db\Query + * @return Query */ public static function withTrashed() { @@ -34,7 +36,7 @@ trait SoftDelete /** * 只查询软删除数据 * @access public - * @return \think\db\Query + * @return Query */ public static function onlyTrashed() { @@ -115,13 +117,13 @@ trait SoftDelete $where[$name] = ['not null', '']; } // 恢复删除 - return $this->removeWhereField($this->getDeleteTimeField(true))->where($where)->update([$name => null]); + return $this->db(false)->removeWhereField($this->getDeleteTimeField(true))->where($where)->update([$name => null]); } /** * 查询默认不包含软删除数据 * @access protected - * @param \think\db\Query $query 查询对象 + * @param Query $query 查询对象 * @return void */ protected function base($query)