周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 0c45363c92d6134c0c34f94a8623df8e1370c93f 2 个父辈 058c2d16 1ea41ff2

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 5 行增加 和 1 行删除
@@ -255,8 +255,12 @@ class OptimizeController extends BaseController @@ -255,8 +255,12 @@ class OptimizeController extends BaseController
255 $query = $query->where('gl_project.site_status',$this->map['site_status']); 255 $query = $query->where('gl_project.site_status',$this->map['site_status']);
256 } 256 }
257 if(isset($this->map['seo_plan'])){ 257 if(isset($this->map['seo_plan'])){
  258 + if(is_array($this->map['seo_plan'])){
  259 + $query = $query->whereIn('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
  260 + }else{
258 $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']); 261 $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
259 } 262 }
  263 + }
260 if(isset($this->map['main_lang_id'])){ 264 if(isset($this->map['main_lang_id'])){
261 $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']); 265 $query = $query->where('gl_project.main_lang_id',$this->map['main_lang_id']);
262 } 266 }
@@ -315,7 +315,7 @@ class ProjectController extends BaseController @@ -315,7 +315,7 @@ class ProjectController extends BaseController
315 } 315 }
316 } 316 }
317 if(isset($this->map['seo_plan'])){ 317 if(isset($this->map['seo_plan'])){
318 - $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']); 318 + $query = $query->where('gl_project_deploy_build.seo_plan','!=',0);
319 } 319 }
320 if(isset($this->map['site_status'])){ 320 if(isset($this->map['site_status'])){
321 $query = $query->where('gl_project.site_status',$this->map['site_status']); 321 $query = $query->where('gl_project.site_status',$this->map['site_status']);