正在显示
1 个修改的文件
包含
10 行增加
和
8 行删除
| @@ -126,16 +126,18 @@ class AsideTicketController extends BaseController | @@ -126,16 +126,18 @@ class AsideTicketController extends BaseController | ||
| 126 | $query->orderBy($sortField, $sortOrder); | 126 | $query->orderBy($sortField, $sortOrder); |
| 127 | if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc'); | 127 | if ($sortField != 'plan_end_at') $query->orderBy('plan_end_at', 'asc'); |
| 128 | $lists = $query->paginate($this->row, ['*'], 'page', $this->page); | 128 | $lists = $query->paginate($this->row, ['*'], 'page', $this->page); |
| 129 | - foreach ($lists['list'] as $key => $item){ | ||
| 130 | - //计算超时多少个小时 | ||
| 131 | - if($item['status'] == 0){ | ||
| 132 | - $end = date('Y-m-d H:i:s'); | ||
| 133 | - $start = $item['plan_end_at']; | ||
| 134 | - if($start < $end){ | ||
| 135 | - $item['plan_ent_time'] = diffInHours($start,$end); | 129 | + if(!empty($lists) && !empty($lists['list'])){ |
| 130 | + foreach ($lists['list'] as $key => $item){ | ||
| 131 | + //计算超时多少个小时 | ||
| 132 | + if($item['status'] == 0){ | ||
| 133 | + $end = date('Y-m-d H:i:s'); | ||
| 134 | + $start = $item['plan_end_at']; | ||
| 135 | + if($start < $end){ | ||
| 136 | + $item['plan_ent_time'] = diffInHours($start,$end); | ||
| 137 | + } | ||
| 136 | } | 138 | } |
| 139 | + $lists['list'][$key] = $item; | ||
| 137 | } | 140 | } |
| 138 | - $lists['list'][$key] = $item; | ||
| 139 | } | 141 | } |
| 140 | $this->response('success', Code::SUCCESS, $lists); | 142 | $this->response('success', Code::SUCCESS, $lists); |
| 141 | } | 143 | } |
-
请 注册 或 登录 后发表评论