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

gx



查看合并请求 !1625

@@ -38,7 +38,8 @@ class GoogleSearchController extends BaseController
             //获取当前项目域名
             //获取当前项目域名
             $domain = parse_url($this->user['domain'], PHP_URL_HOST);
             $domain = parse_url($this->user['domain'], PHP_URL_HOST);
             $noticeModel = new NoticeLog();
             $noticeModel = new NoticeLog();
-            $info = $noticeModel->read(['project_id' => $this->user['project_id'],'domain'=>$domain,'type'=>$this->param['type'],'status'=>NoticeLog::STATUS_PENDING]);
+            $info = $noticeModel->read(['status'=>NoticeLog::STATUS_PENDING,'type'=>$noticeModel::GOOGLE_SEARCH,'data'=>json_encode(['project_id' => $this->user['project_id'],'domain'=>$domain,'type'=>$this->param['type']],true
+            )]);
             if($info === false){
             if($info === false){
                 $noticeModel->addReturnId(['data'=>json_encode(['project_id' => $this->user['project_id'],'domain'=>$domain,'type'=>$this->param['type']],true
                 $noticeModel->addReturnId(['data'=>json_encode(['project_id' => $this->user['project_id'],'domain'=>$domain,'type'=>$this->param['type']],true
                 ),'type'=>$noticeModel::GOOGLE_SEARCH]);
                 ),'type'=>$noticeModel::GOOGLE_SEARCH]);