修改获取资讯搜索状态问题

app/JsonRpc/CollectorService.php

@@ -633,18 +633,16 @@ class CollectorService implements CollectorServiceInterface
         ];
         //若存在条件参数都存到where数组
         if(isset($data['title']) && !empty($data['title'])){
-            $where[] = ['title','like','%'.$data['title'].'%'];
+            array_push($where,['title','like','%'.$data['title'].'%']);
         }
         if(isset($data['source']) && !empty($data['source'])){
-            $art_source = Article::where($where)->get();
-            if(!empty($art_source->toArray())){
-
-                $where[] = ['source','like','%'.$data['source'].'%'];
-                
-            } 
+            // $art_source = Article::where($where)->get();
+            // if(!empty($art_source->toArray())){
+                array_push($where,['copyfrom','like','%'.$data['source'].'%']);
+            // } 
         }
-        if(isset($data['state']) && !empty($data['state'])){
-            $where[] = ['state','=',$data['state']];
+        if(isset($data['state']) && $data['state']!=''){
+            array_push($where,['state',$data['state']]);
         }
         //跨库查询栏目导航及采集的新闻
         $info = Article::query()
@@ -657,11 +655,12 @@ class CollectorService implements CollectorServiceInterface
         if($count == 0){
             return Result::error('暂无资讯');
         }
-        $data = [
+
+        $result = [
             'rep' => $info->toArray(),
             'count' => $count
         ];
-        return  Result::success($data);
+        return  Result::success($result);
     }
     /**
      * 获取某个资讯
@@ -785,11 +784,11 @@ class CollectorService implements CollectorServiceInterface
                     $art_catid = Article::whereIn('id',$info)->whereNull('catid')->count();
                     if($art_catid>0){
                         $catid = isset($catid['catid'])?$catid['catid']:'';
-                        var_dump("更新数据111：",$catid,$cat_arr_id);
+                        // var_dump("更新数据111：",$catid,$cat_arr_id);
                         $result = Article::whereIn('id',$info)->update(['catid'=>$catid,'cat_arr_id'=>$cat_arr_id['cat_arr_id']]);
-                        var_dump("更新数据111：",$result);
+                        // var_dump("更新数据111：",$result);
                     }else{
-                        var_dump("已全部关联导航池请勿重复关联");
+                        // var_dump("已全部关联导航池请勿重复关联");
                         return Result::error('已全部关联导航池请勿重复关联');
                     }
                 }else{