Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -255,7 +255,11 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project.site_status',$this->map['site_status']);
         }
         if(isset($this->map['seo_plan'])){
-            $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            if(is_array($this->map['seo_plan'])){
+                $query = $query->whereIn('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            }else{
+                $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            }
         }
         if(isset($this->map['main_lang_id'])){
             $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']);

@@ -315,7 +315,7 @@ class ProjectController extends BaseController
             }
         }
         if(isset($this->map['seo_plan'])){
-            $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+            $query = $query->where('gl_project_deploy_build.seo_plan','!=',0);
         }
         if(isset($this->map['site_status'])){
             $query = $query->where('gl_project.site_status',$this->map['site_status']);