变更数据

@@ -268,12 +268,21 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
         }
         if(isset($this->map['seo_plan'])){
-            if(is_array($this->map['seo_plan'])){
-                $query = $query->whereIn('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            if($this->map['seo_plan'] == 0){
+                $query = $query->where('gl_project_deploy_build.plan','!=',0);
+            }elseif(is_array($this->map['seo_plan'])){
+                $query = $query->whereIn('gl_project_deploy_build.seo_plan',$this->map['seo_plan'])->where('gl_project_deploy_build.plan',0);
             }else{
                 $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
             }
         }
+        if (isset($this->map['seo_plan'])) {
+            $query = $query->where('gl_project_deploy_build.seo_plan', '!=', 0)
+                ->where(function ($subQuery) {
+                    $subQuery->where('gl_project_deploy_build.plan', '=', 0)
+                        ->orWhere('gl_project_deploy_build.seo_plan', '!=', 9);
+                });
+        }
         if(isset($this->map['main_lang_id'])){
             $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']);
         }