合并分支 'akun' 到 'master'

Akun



查看合并请求 !2132

@@ -188,6 +188,7 @@ class Supervisory extends Command
             ->where('gl_project.type', Project::TYPE_TWO)
             ->where('gl_project.type', Project::TYPE_TWO)
             ->where('gl_project.extend_type', 0) // 是否续费是由extend_type字段控制
             ->where('gl_project.extend_type', 0) // 是否续费是由extend_type字段控制
             ->where('gl_project.delete_status', Project::IS_DEL_FALSE)
             ->where('gl_project.delete_status', Project::IS_DEL_FALSE)
+            ->where('gl_project.project_type', '!=', Project::PROJECT_TYPE_SEO)//排除白帽项目
             ->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);
             })
             })