作者 lyh

gx

@@ -70,7 +70,8 @@ class Base extends Model @@ -70,7 +70,8 @@ class Base extends Model
70 public function lists($map, $page, $row, $order = 'id', $fields = ['*']): array 70 public function lists($map, $page, $row, $order = 'id', $fields = ['*']): array
71 { 71 {
72 $query = $this->formatQuery($map); 72 $query = $this->formatQuery($map);
73 - $lists = $query->select($fields)->orderBy($order,'desc')->orderBy('created_at','desc')->paginate($row, ['*'], 'page', $page); 73 + $query = $this->sortOrder($query,$order);
  74 + $lists = $query->select($fields)->paginate($row, ['*'], 'page', $page);
74 if (empty($lists)) { 75 if (empty($lists)) {
75 return []; 76 return [];
76 } 77 }
@@ -89,7 +90,8 @@ class Base extends Model @@ -89,7 +90,8 @@ class Base extends Model
89 public function list($map = [],$order = 'id',$fields = ['*']): array 90 public function list($map = [],$order = 'id',$fields = ['*']): array
90 { 91 {
91 $query = $this->formatQuery($map); 92 $query = $this->formatQuery($map);
92 - $lists = $query->select($fields)->orderBy($order,'desc')->get(); 93 + $query = $this->sortOrder($query,$order);
  94 + $lists = $query->select($fields)->get();
93 if (empty($lists)) { 95 if (empty($lists)) {
94 return []; 96 return [];
95 } 97 }
@@ -213,4 +215,22 @@ class Base extends Model @@ -213,4 +215,22 @@ class Base extends Model
213 } 215 }
214 216
215 217
  218 + /**
  219 + * @remark :排序
  220 + * @name :sortOrder
  221 + * @author :lyh
  222 + * @method :post
  223 + * @time :2023/8/21 8:54
  224 + */
  225 + public function sortOrder(&$query,$order){
  226 + if(is_array($order)){
  227 + foreach ($order as $v){
  228 + $query = $query->orderBy($v,'desc');
  229 + }
  230 + }else{
  231 + $query = $query->orderBy($order,'desc');
  232 + }
  233 + return $query;
  234 + }
  235 +
216 } 236 }