|
...
|
...
|
@@ -70,7 +70,8 @@ class Base extends Model |
|
|
|
public function lists($map, $page, $row, $order = 'id', $fields = ['*']): array
|
|
|
|
{
|
|
|
|
$query = $this->formatQuery($map);
|
|
|
|
$lists = $query->select($fields)->orderBy($order,'desc')->orderBy('created_at','desc')->paginate($row, ['*'], 'page', $page);
|
|
|
|
$query = $this->sortOrder($query,$order);
|
|
|
|
$lists = $query->select($fields)->paginate($row, ['*'], 'page', $page);
|
|
|
|
if (empty($lists)) {
|
|
|
|
return [];
|
|
|
|
}
|
|
...
|
...
|
@@ -89,7 +90,8 @@ class Base extends Model |
|
|
|
public function list($map = [],$order = 'id',$fields = ['*']): array
|
|
|
|
{
|
|
|
|
$query = $this->formatQuery($map);
|
|
|
|
$lists = $query->select($fields)->orderBy($order,'desc')->get();
|
|
|
|
$query = $this->sortOrder($query,$order);
|
|
|
|
$lists = $query->select($fields)->get();
|
|
|
|
if (empty($lists)) {
|
|
|
|
return [];
|
|
|
|
}
|
|
...
|
...
|
@@ -213,4 +215,22 @@ class Base extends Model |
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @remark :排序
|
|
|
|
* @name :sortOrder
|
|
|
|
* @author :lyh
|
|
|
|
* @method :post
|
|
|
|
* @time :2023/8/21 8:54
|
|
|
|
*/
|
|
|
|
public function sortOrder(&$query,$order){
|
|
|
|
if(is_array($order)){
|
|
|
|
foreach ($order as $v){
|
|
|
|
$query = $query->orderBy($v,'desc');
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
$query = $query->orderBy($order,'desc');
|
|
|
|
}
|
|
|
|
return $query;
|
|
|
|
}
|
|
|
|
|
|
|
|
} |
...
|
...
|
|