|
@@ -31,10 +31,10 @@ class Base extends Model |
|
@@ -31,10 +31,10 @@ class Base extends Model |
|
31
|
* @author :liyuhang
|
31
|
* @author :liyuhang
|
|
32
|
* @method
|
32
|
* @method
|
|
33
|
*/
|
33
|
*/
|
|
34
|
- public function lists($map, $page, $row, $order = 'id', $fields = ['*']): array
|
34
|
+ public function lists($map, $page, $row, $order = 'id', $fields = ['*'], $sort = 'desc'): array
|
|
35
|
{
|
35
|
{
|
|
36
|
$query = $this->formatQuery($map);
|
36
|
$query = $this->formatQuery($map);
|
|
37
|
- $query = $this->sortOrder($query,$order);
|
37
|
+ $query = $this->sortOrder($query,$order,$sort);
|
|
38
|
$lists = $query->select($fields)->paginate($row, ['*'], 'page', $page);
|
38
|
$lists = $query->select($fields)->paginate($row, ['*'], 'page', $page);
|
|
39
|
if (empty($lists)) {
|
39
|
if (empty($lists)) {
|
|
40
|
return [];
|
40
|
return [];
|
|
@@ -51,10 +51,10 @@ class Base extends Model |
|
@@ -51,10 +51,10 @@ class Base extends Model |
|
51
|
* @author :liyuhang
|
51
|
* @author :liyuhang
|
|
52
|
* @method
|
52
|
* @method
|
|
53
|
*/
|
53
|
*/
|
|
54
|
- public function list($map = [],$order = 'id',$fields = ['*']): array
|
54
|
+ public function list($map = [],$order = 'id',$fields = ['*'],$sort = 'desc'): array
|
|
55
|
{
|
55
|
{
|
|
56
|
$query = $this->formatQuery($map);
|
56
|
$query = $this->formatQuery($map);
|
|
57
|
- $query = $this->sortOrder($query,$order);
|
57
|
+ $query = $this->sortOrder($query,$order,$sort);
|
|
58
|
$lists = $query->select($fields)->get();
|
58
|
$lists = $query->select($fields)->get();
|
|
59
|
if (empty($lists)) {
|
59
|
if (empty($lists)) {
|
|
60
|
return [];
|
60
|
return [];
|
|
@@ -203,13 +203,13 @@ class Base extends Model |
|
@@ -203,13 +203,13 @@ class Base extends Model |
|
203
|
* @method :post
|
203
|
* @method :post
|
|
204
|
* @time :2023/8/21 8:54
|
204
|
* @time :2023/8/21 8:54
|
|
205
|
*/
|
205
|
*/
|
|
206
|
- public function sortOrder(&$query,$order){
|
206
|
+ public function sortOrder(&$query,$order,$sort){
|
|
207
|
if(is_array($order)){
|
207
|
if(is_array($order)){
|
|
208
|
foreach ($order as $v){
|
208
|
foreach ($order as $v){
|
|
209
|
- $query = $query->orderBy($v,'desc');
|
209
|
+ $query = $query->orderBy($v,$sort);
|
|
210
|
}
|
210
|
}
|
|
211
|
}else{
|
211
|
}else{
|
|
212
|
- $query = $query->orderBy($order,'desc');
|
212
|
+ $query = $query->orderBy($order,$sort);
|
|
213
|
}
|
213
|
}
|
|
214
|
return $query;
|
214
|
return $query;
|
|
215
|
}
|
215
|
}
|