diff --git a/extend/catcher/CatchQuery.php b/extend/catcher/CatchQuery.php index 18150e9..cd67141 100644 --- a/extend/catcher/CatchQuery.php +++ b/extend/catcher/CatchQuery.php @@ -187,35 +187,22 @@ class CatchQuery extends Query return parent::paginate($listRows, $simple); // TODO: Change the autogenerated stub } + /** - * order 排序 + * 默认排序 * - * @time 2020年04月30日 - * @param string $field + * @time 2020年06月17日 * @param string $order - * @param string $position - * @return $this|CatchQuery + * @return $this */ - public function order($field = '', string $order = 'desc', $position = 'backend') + public function catchOrder($order = 'desc') { - // 排序在前 - if ($position = 'front') { - parent::order($field, $order); - } if (in_array('sort', array_keys($this->getFields()))) { - parent::order('sort', $order); - } - // 紧跟权重的排序 - if ($position == 'middle') { - parent::order($field, $order); + $this->order($this->getTable() . '.sort', $order); } - parent::order($this->getPk(), $order); - // 最后插入排序 - if ($position == 'backend') { - parent::order($field, $order); - } + $this->order($this->getTable() . '.' . $this->getPk(), $order); - return $this; + return $this; } }