合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2691

@@ -125,7 +125,8 @@ class AsideTicketController extends BaseController
         $sortOrder = strtolower($request->input('sort_order', 'asc'));
         $query->orderBy($sortField, $sortOrder);
         if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
-        $lists = $query->paginate($this->row, ['*'], 'page', $this->page);
+        $lists = $query->paginate($this->row, ['*'], 'page', $this->page)->toArray();
+        if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $key => $item){
                 //计算超时多少个小时
                 if($item['status'] == 0){
@@ -137,6 +138,7 @@ class AsideTicketController extends BaseController
                 }
                 $lists['list'][$key] = $item;
             }
+        }
         $this->response('success', Code::SUCCESS, $lists);
     }