合并分支 'lyh-server' 到 'master'

更新推荐供应商



查看合并请求 !1888

@@ -166,7 +166,7 @@ class RecommendedSuppliers extends Command
         $saveData = [
         $saveData = [
             'project_id'=>$project_id,
             'project_id'=>$project_id,
             'keyword'=>$keyword,
             'keyword'=>$keyword,
-            'data'=>json_encode($res['data'] ?? '')
+            'data'=>json_encode($res['data'] ?? [])
         ];
         ];
         $purchaserModel = new Purchaser();
         $purchaserModel = new Purchaser();
         $purchaserModel->add($saveData);
         $purchaserModel->add($saveData);

@@ -322,7 +322,7 @@ class NewsController extends BaseController
         ]);
         ]);
         $data = curl_get('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],true);
         $data = curl_get('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],true);
         if(isset($data['data']['p'][0]) && !empty($data['data']['p'][0])){
         if(isset($data['data']['p'][0]) && !empty($data['data']['p'][0])){
-            $data['data']['p'][0] = str_replace('&nbsp' ,'',$data['data']['p'][0]);
+            $data['data']['p'][0] = str_replace('&nbsp' ,' ',$data['data']['p'][0]);
         }
         }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }