作者 lyh

gx

@@ -189,11 +189,11 @@ class VideoTask extends Command @@ -189,11 +189,11 @@ class VideoTask extends Command
189 public function getProjectKeyword($number,$keywords = []) 189 public function getProjectKeyword($number,$keywords = [])
190 { 190 {
191 191
192 - $keyword_id = Keyword::where('video', null)->whereIn("title", $keywords) 192 + $keyword_id = Keyword::where('video', null)->whereIn("title", $keywords)->whereNull('deleted_at')
193 ->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->limit($number)->pluck('id')->toArray(); 193 ->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->limit($number)->pluck('id')->toArray();
194 $need = $number - count($keyword_id); 194 $need = $number - count($keyword_id);
195 if ($need > 0) { 195 if ($need > 0) {
196 - $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag') 196 + $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')->whereNull('deleted_at')
197 ->whereNotNull('keyword_content')->whereNotIn('id', $keyword_id)->orderBy('id','asc')->limit($need)->pluck('id')->toArray(); 197 ->whereNotNull('keyword_content')->whereNotIn('id', $keyword_id)->orderBy('id','asc')->limit($need)->pluck('id')->toArray();
198 } 198 }
199 $keyword_arr_id = array_merge($keyword_id, $keyword_arr_id); 199 $keyword_arr_id = array_merge($keyword_id, $keyword_arr_id);