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