|
@@ -228,7 +228,6 @@ class CollectorService implements CollectorServiceInterface
|
|
['web_id','=', $data['web_id']]
|
|
['web_id','=', $data['web_id']]
|
|
];
|
|
];
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
if(isset($data['keyWord'])){
|
|
if(isset($data['keyWord'])){
|
|
//若存在搜索词,则存到条件数组$where中
|
|
//若存在搜索词,则存到条件数组$where中
|
|
@@ -485,8 +484,11 @@ class CollectorService implements CollectorServiceInterface
|
|
public function addCatid(array $data): array
|
|
public function addCatid(array $data): array
|
|
{
|
|
{
|
|
$id = $data['rule_id'];
|
|
$id = $data['rule_id'];
|
|
- //查找此规则任务下的文章是否都已经导入
|
|
|
|
- $info = Article::where('rule_id',$id)->where('state',0)->select('id')->get();
|
|
|
|
|
|
+ $art = Article::where('rule_id',$id)->select('id')->count();
|
|
|
|
+ if($art==0){
|
|
|
|
+ return Result::error('还未采集,请采集');
|
|
|
|
+ }else{
|
|
|
|
+ $info = Article::where('rule_id',$id)->where('state',0)->select('id')->get();
|
|
if(empty($info->toArray())){
|
|
if(empty($info->toArray())){
|
|
return Result::error('所有文章都已导入,不可修改关联的导航池!');
|
|
return Result::error('所有文章都已导入,不可修改关联的导航池!');
|
|
}else{
|
|
}else{
|
|
@@ -515,6 +517,9 @@ class CollectorService implements CollectorServiceInterface
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
+ //查找此规则任务下的文章是否都已经导入
|
|
|
|
+
|
|
return Result::success($result);
|
|
return Result::success($result);
|
|
}
|
|
}
|
|
/**
|
|
/**
|