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

@@ -167,7 +167,7 @@ class VideoTask extends Command
      */
      */
     public function getProjectKeyword($number)
     public function getProjectKeyword($number)
     {
     {
-        $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag%')->whereNotNull('keyword_content')->pluck('id')->toArray();
+        $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%tag%')->whereNotNull('keyword_content')->pluck('id')->toArray();
         $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         return $keyword;
         return $keyword;

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