作者 李宇航

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

gx



查看合并请求 !1768
@@ -36,6 +36,7 @@ class GoogleSearchController extends BaseController @@ -36,6 +36,7 @@ class GoogleSearchController extends BaseController
36 ]); 36 ]);
37 //查询详情数据 37 //查询详情数据
38 $searchDetailModel = new GoogleSearchDetail(); 38 $searchDetailModel = new GoogleSearchDetail();
  39 + $this->map['project_id'] = $this->user['project_id'];
39 $data = $searchDetailModel->lists($this->map,$this->page,$this->row,'clicks',['keys','click_rate','impressions_rate']); 40 $data = $searchDetailModel->lists($this->map,$this->page,$this->row,'clicks',['keys','click_rate','impressions_rate']);
40 if(!empty($data)){ 41 if(!empty($data)){
41 if($this->param['type'] == 'country'){ 42 if($this->param['type'] == 'country'){