作者 lyh

gx

@@ -23,7 +23,7 @@ class MailController extends BaseController @@ -23,7 +23,7 @@ class MailController extends BaseController
23 $lists = $mailModel->where('status',0)->where($this->map) 23 $lists = $mailModel->where('status',0)->where($this->map)
24 ->where('user_list','like','%,'.$this->uid.',%') 24 ->where('user_list','like','%,'.$this->uid.',%')
25 ->orWhere('user_list', '') 25 ->orWhere('user_list', '')
26 - ->select(['*'])->orderBy($this->order,'desc') 26 + ->orderBy($this->order,'desc')
27 ->paginate($this->row, ['*'], 'page', $this->page); 27 ->paginate($this->row, ['*'], 'page', $this->page);
28 if(!empty($lists)){ 28 if(!empty($lists)){
29 $lists = $lists->toArray(); 29 $lists = $lists->toArray();
@@ -38,7 +38,7 @@ class Base extends Model @@ -38,7 +38,7 @@ class Base extends Model
38 { 38 {
39 $query = $this->formatQuery($map); 39 $query = $this->formatQuery($map);
40 $query = $this->sortOrder($query,$order,$sort); 40 $query = $this->sortOrder($query,$order,$sort);
41 - $lists = $query->select($fields)->paginate($row, ['*'], 'page', $page); 41 + $lists = $query->select($fields)->paginate($row, $fields, 'page', $page);
42 if (empty($lists)) { 42 if (empty($lists)) {
43 return []; 43 return [];
44 } 44 }