Merge branch 'collector_1106_fr'

app/JsonRpc/CollectorService.php

@@ -870,7 +870,7 @@ class CollectorService implements CollectorServiceInterface
         ];
         //获取某个规则任务下的已采集未导入的文章及文章详情
         $arts_id = Article::where($where)->wherenotNull('catid')->select('id')->orderBy('id')->get()->toArray();
-        $arts = Article::where($where)->wherenotNull('catid')->select('title','catid','level','introduce','keyword','author','copyfrom','fromurl','hits','islink','imgurl','admin_user_id','is_original')->orderBy('id')->get()->toArray();       
+        $arts = Article::where($where)->wherenotNull('catid')->select('title','catid','level','introduce','keyword','author','copyfrom','fromurl','hits','islink','imgurl','admin_user_id','is_original','cat_arr_id')->orderBy('id')->get()->toArray();       
         // var_dump('=============:::',$arts_id);
         $arts_data = ArticleData::whereIn('article_id',$arts_id)->select('content')->orderBy('article_id','desc')->get()->toArray();
         // var_dump('=============',$arts);