作者 zhl

添加删除条件

@@ -42,6 +42,7 @@ class PrivateController extends BaseController @@ -42,6 +42,7 @@ class PrivateController extends BaseController
42 ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id') 42 ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
43 ->where('gl_project.type', Project::TYPE_TWO) 43 ->where('gl_project.type', Project::TYPE_TWO)
44 ->where('gl_project.extend_type', 0) // 是否续费是由extend_type字段控制 44 ->where('gl_project.extend_type', 0) // 是否续费是由extend_type字段控制
  45 + ->where('gl_project.delete_status', Project::IS_DEL_FALSE)
45 ->where(function ($subQuery) { 46 ->where(function ($subQuery) {
46 $subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE); 47 $subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
47 }) 48 })