Merge branch 'collector_1106_fr'

app/JsonRpc/CollectorService.php

@@ -655,16 +655,16 @@ class CollectorService implements CollectorServiceInterface
             ['rule_id','=',$data['rule_id']]
         ];
         //若存在条件参数都存到where数组
-        if(isset($data['title'])){
+        if(isset($data['title']) && !empty($data['title'])){
             $where[] = ['title','like','%'.$data['title'].'%'];
         }
-        if(isset($data['source'])){
+        if(isset($data['source']) && !empty($data['source'])){
             $art_source = Article::where($where)->get();
             if(!empty($art_source->toArray())){
                 $where[] = ['source','like','%'.$data['source'].'%'];
             } 
         }
-        if(isset($data['state'])){
+        if(isset($data['state']) && !empty($data['state'])){
             $where[] = ['state','=',$data['state']];
         }
         //跨库查询栏目导航及采集的新闻