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

Lyh server



查看合并请求 !2691

@@ -125,17 +125,19 @@ class AsideTicketController extends BaseController
         $sortOrder = strtolower($request->input('sort_order', 'asc'));
         $sortOrder = strtolower($request->input('sort_order', 'asc'));
         $query->orderBy($sortField, $sortOrder);
         $query->orderBy($sortField, $sortOrder);
         if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
         if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc');
-        $lists = $query->paginate($this->row, ['*'], 'page', $this->page);
-        foreach ($lists['list'] as $key => $item){
-            //计算超时多少个小时
-            if($item['status'] == 0){
-                $end = date('Y-m-d H:i:s');
-                $start = $item['plan_end_at'];
-                if($start < $end){
-                    $item['plan_ent_time'] =  diffInHours($start,$end);
+        $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){
+                    $end = date('Y-m-d H:i:s');
+                    $start = $item['plan_end_at'];
+                    if($start < $end){
+                        $item['plan_ent_time'] =  diffInHours($start,$end);
+                    }
                 }
                 }
+                $lists['list'][$key] = $item;
             }
             }
-            $lists['list'][$key] = $item;
         }
         }
         $this->response('success', Code::SUCCESS, $lists);
         $this->response('success', Code::SUCCESS, $lists);
     }
     }