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

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