作者 张关杰

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

... ... @@ -63,7 +63,7 @@ class KeywordVideoController extends BaseController
$query->where('gl_project.title','like','%'.$this->map['project_name'].'%');
}
if(isset($this->map['status'])){
$query->where('gl_keyword_video_task.title',$this->map['status']);
$query->where('gl_keyword_video_task.status',$this->map['status']);
}
return $query;
}
... ...