作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !2940
@@ -145,6 +145,7 @@ class SyncInquiryProject extends Command @@ -145,6 +145,7 @@ class SyncInquiryProject extends Command
145 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id') 145 ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
146 ->where('gl_project.type', Project::TYPE_TWO) 146 ->where('gl_project.type', Project::TYPE_TWO)
147 ->where('gl_project.extend_type', '!=', 5) 147 ->where('gl_project.extend_type', '!=', 5)
  148 + ->where('gl_project.delete_status', Project::IS_DEL_FALSE)
148 ->where(function ($query) { 149 ->where(function ($query) {
149 $query->orwhere('gl_project_online_check.qa_status', OnlineCheck::STATUS_ONLINE_TRUE) 150 $query->orwhere('gl_project_online_check.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
150 ->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE); 151 ->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);