合并分支 'zhl' 到 'master'
添加返回标签 查看合并请求 !1370
正在显示
2 个修改的文件
包含
3 行增加
和
2 行删除
| @@ -42,7 +42,7 @@ class PrivateController extends BaseController | @@ -42,7 +42,7 @@ class PrivateController extends BaseController | ||
| 42 | public function optimizeProjectList(Request $request) | 42 | public function optimizeProjectList(Request $request) |
| 43 | { | 43 | { |
| 44 | $page_size = $request->input('page_size', 20); | 44 | $page_size = $request->input('page_size', 20); |
| 45 | - $field = ['gl_project.id', 'gl_project.company', 'gl_project.is_upgrade', 'b.start_date', 'd.domain']; | 45 | + $field = ['gl_project.id', 'gl_project.company', 'gl_project.is_upgrade', 'b.start_date', 'd.domain', 'b.special']; |
| 46 | $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id') | 46 | $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id') |
| 47 | ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id') | 47 | ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id') |
| 48 | ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id') | 48 | ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id') |
-
请 注册 或 登录 后发表评论