作者 zhl

u

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