合并分支 'zhl' 到 'master'

'u'



查看合并请求 !354

@@ -35,7 +35,6 @@ class PrivateController extends BaseController
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.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')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
             ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
             ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
-            ->where('c.qa_status', '=', OnlineCheck::STATUS_ONLINE_TRUE)
             ->where(function ($subQuery) {
             ->where(function ($subQuery) {
                 $subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
                 $subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
             })
             })