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

gx



查看合并请求 !1771

@@ -25,6 +25,7 @@ class GoogleLinkController extends BaseController
      */
      */
     public function getLink(){
     public function getLink(){
         $linkModel = new GoogleLink();
         $linkModel = new GoogleLink();
+        $this->map['project_id'] = $this->user['project_id'];
         $lists = $linkModel->lists($this->map,$this->page,$this->row,'id',['url','moz_da','status','google_search','date','project_id','domain']);
         $lists = $linkModel->lists($this->map,$this->page,$this->row,'id',['url','moz_da','status','google_search','date','project_id','domain']);
         if(empty($lists['list'])){
         if(empty($lists['list'])){
             $linkService = new GoogleLinkService();
             $linkService = new GoogleLinkService();