正在显示
1 个修改的文件
包含
6 行增加
和
2 行删除
| @@ -320,8 +320,12 @@ class ProjectController extends BaseController | @@ -320,8 +320,12 @@ class ProjectController extends BaseController | ||
| 320 | }); | 320 | }); |
| 321 | } | 321 | } |
| 322 | } | 322 | } |
| 323 | - if(isset($this->map['seo_plan'])){ | ||
| 324 | - $query = $query->whereNotIn('gl_project_deploy_build.seo_plan',[0,9])->where('gl_project_deploy_build.plan',0); | 323 | + if (isset($this->map['seo_plan'])) { |
| 324 | + $query = $query->where('gl_project_deploy_build.seo_plan', '!=', 0) | ||
| 325 | + ->where(function ($subQuery) { | ||
| 326 | + $subQuery->where('gl_project_deploy_build.plan', '=', 0) | ||
| 327 | + ->orWhere('gl_project_deploy_build.seo_plan', '!=', 9); | ||
| 328 | + }); | ||
| 325 | } | 329 | } |
| 326 | if(isset($this->map['site_status'])){ | 330 | if(isset($this->map['site_status'])){ |
| 327 | $query = $query->where('gl_project.site_status',$this->map['site_status']); | 331 | $query = $query->where('gl_project.site_status',$this->map['site_status']); |
-
请 注册 或 登录 后发表评论