|
...
|
...
|
@@ -34,8 +34,11 @@ class PrivateController extends BaseController |
|
|
|
$result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
|
|
|
|
->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
|
|
|
|
->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
|
|
|
|
->where('c.qa_status', '=', OnlineCheck::STATUS_ONLINE_TRUE)
|
|
|
|
->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
|
|
|
|
->where('c.qa_status', '=', OnlineCheck::STATUS_ONLINE_TRUE)
|
|
|
|
->where(function ($subQuery) {
|
|
|
|
$subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
|
|
|
|
})
|
|
|
|
->paginate($page_size)
|
|
|
|
->toArray();
|
|
|
|
return $this->success($result);
|
...
|
...
|
|