|
|
@@ -806,21 +806,19 @@ class CollectorService implements CollectorServiceInterface
|
|
|
//查询未导入的文章id
|
|
|
$art_catid = Article::whereIn('id',$info)->whereNull('catid')->count();
|
|
|
if($art_catid>0){
|
|
|
- $catid = (int)$catid['catid'];
|
|
|
- $cat_arr_id = json_encode([$catid]);
|
|
|
-
|
|
|
+ $catid = isset($art_catid['cat_arr_id'])?end($art_catid['cat_arr_id']):'';
|
|
|
+ $cat_arr_id = isset($data['cat_arr_id'])?json_encode($data['cat_arr_id']):'';
|
|
|
$result = Article::whereIn('id',$info)->update(['catid'=>$catid,'cat_arr_id'=>$cat_arr_id]);
|
|
|
-
|
|
|
}else{
|
|
|
$result = ['已全部关联导航，无需再次关联！'];
|
|
|
}
|
|
|
}else{
|
|
|
//若不存在已导入的文章则判断是否存在导航id
|
|
|
- if(isset($data['catid'])){
|
|
|
- $catid = (int)$data['catid'];
|
|
|
- $cat_arr_id = json_encode([$catid]);
|
|
|
+ if(isset($data['cat_arr_id'])){
|
|
|
+ $catid = isset($data['cat_arr_id'])?end($data['cat_arr_id']):'';
|
|
|
+ $cat_arr_id = isset($data['cat_arr_id'])?json_encode($data['cat_arr_id']):'';
|
|
|
//若存在直接使用此导航id
|
|
|
- $result = Article::whereIn('id',$info)->update(['catid'=>$data['catid'],'cat_arr_id'=>$cat_arr_id]);
|
|
|
+ $result = Article::whereIn('id',$info)->update(['catid'=>$catid,'cat_arr_id'=>$cat_arr_id]);
|
|
|
}else{
|
|
|
//若不存在则返回所有导航栏目
|
|
|
$result = Category::select('id','name')->get();
|
15313670163