|
...
|
...
|
@@ -31,10 +31,10 @@ class Base extends Model |
|
|
|
* @author :liyuhang
|
|
|
|
* @method
|
|
|
|
*/
|
|
|
|
public function lists($map, $page, $row, $order = 'id', $fields = ['*']): array
|
|
|
|
public function lists($map, $page, $row, $order = 'id', $fields = ['*'], $sort = 'desc'): array
|
|
|
|
{
|
|
|
|
$query = $this->formatQuery($map);
|
|
|
|
$query = $this->sortOrder($query,$order);
|
|
|
|
$query = $this->sortOrder($query,$order,$sort);
|
|
|
|
$lists = $query->select($fields)->paginate($row, ['*'], 'page', $page);
|
|
|
|
if (empty($lists)) {
|
|
|
|
return [];
|
|
...
|
...
|
@@ -51,10 +51,10 @@ class Base extends Model |
|
|
|
* @author :liyuhang
|
|
|
|
* @method
|
|
|
|
*/
|
|
|
|
public function list($map = [],$order = 'id',$fields = ['*']): array
|
|
|
|
public function list($map = [],$order = 'id',$fields = ['*'],$sort = 'desc'): array
|
|
|
|
{
|
|
|
|
$query = $this->formatQuery($map);
|
|
|
|
$query = $this->sortOrder($query,$order);
|
|
|
|
$query = $this->sortOrder($query,$order,$sort);
|
|
|
|
$lists = $query->select($fields)->get();
|
|
|
|
if (empty($lists)) {
|
|
|
|
return [];
|
|
...
|
...
|
@@ -203,13 +203,13 @@ class Base extends Model |
|
|
|
* @method :post
|
|
|
|
* @time :2023/8/21 8:54
|
|
|
|
*/
|
|
|
|
public function sortOrder(&$query,$order){
|
|
|
|
public function sortOrder(&$query,$order,$sort){
|
|
|
|
if(is_array($order)){
|
|
|
|
foreach ($order as $v){
|
|
|
|
$query = $query->orderBy($v,'desc');
|
|
|
|
$query = $query->orderBy($v,$sort);
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
$query = $query->orderBy($order,'desc');
|
|
|
|
$query = $query->orderBy($order,$sort);
|
|
|
|
}
|
|
|
|
return $query;
|
|
|
|
}
|
...
|
...
|
|