1

app/JsonRpc/CollectorService.php

@@ -783,17 +783,11 @@ class CollectorService implements CollectorServiceInterface
                     //查询未导入的文章id
                     $art_catid = Article::whereIn('id',$info)->whereNull('catid')->count();
                     if($art_catid>0){
-<<<<<<< Updated upstream
-                        $catid = (int)$catid['catid'];
-                        $cat_arr_id = json_encode([$catid]);
-                        $result = Article::whereIn('id',$info)->update(['catid'=>$catid,'cat_arr_id'=>$cat_arr_id]);
-=======
                         $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]);
 
->>>>>>> Stashed changes
                     }else{
                         $result = ['已全部关联导航，无需再次关联！'];
                     }