正在显示
1 个修改的文件
包含
6 行增加
和
3 行删除
| @@ -29,9 +29,12 @@ class OptimizeController extends BaseController | @@ -29,9 +29,12 @@ class OptimizeController extends BaseController | ||
| 29 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id'); | 29 | ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id'); |
| 30 | $query = $this->searchParam($query); | 30 | $query = $this->searchParam($query); |
| 31 | $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page); | 31 | $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page); |
| 32 | - foreach ($lists['list'] as $k => $v){ | ||
| 33 | - $v['plan'] = $project::planMap()[$v['plan']]; | ||
| 34 | - $lists[$k] = $v; | 32 | + if(!empty($lists['list'])){ |
| 33 | + $lists = $lists->toArray(); | ||
| 34 | + foreach ($lists['list'] as $k => $v){ | ||
| 35 | + $v['plan'] = $project::planMap()[$v['plan']]; | ||
| 36 | + $lists[$k] = $v; | ||
| 37 | + } | ||
| 35 | } | 38 | } |
| 36 | $this->response('success',Code::SUCCESS,$lists); | 39 | $this->response('success',Code::SUCCESS,$lists); |
| 37 | } | 40 | } |
-
请 注册 或 登录 后发表评论