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

gx



查看合并请求 !1787

@@ -27,7 +27,7 @@ class GoogleLinkController extends BaseController
         $linkModel = new GoogleLink();
         $linkModel = new GoogleLink();
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['status'] = 1;
         $this->map['status'] = 1;
-        $this->map['created_at'] = ['<=', date('Y-m-d 00:00:00', strtotime('-7 days'))];
+        $this->map['date'] = ['<=', date('Y-m-d 00:00:00', strtotime('-7 days'))];
         $lists = $linkModel->lists($this->map,$this->page,$this->row,'id',['url','moz_da','status','url_domian','google_search','date','project_id','domain']);
         $lists = $linkModel->lists($this->map,$this->page,$this->row,'id',['url','moz_da','status','url_domian','google_search','date','project_id','domain']);
         if(empty($lists['list'])){
         if(empty($lists['list'])){
             $linkService = new GoogleLinkService();
             $linkService = new GoogleLinkService();

@@ -88,8 +88,7 @@ class GoogleLinkService
     public function saveLink($data,$project_id,$domain){
     public function saveLink($data,$project_id,$domain){
         $saveData = [];
         $saveData = [];
         foreach ($data as $val){
         foreach ($data as $val){
-            $timestamp = strtotime($val['created_at']);
-            $date = date('Y-m-d 00:00:00', $timestamp ?? time());
+            $date = date('Y-m-d 00:00:00', time());
             if($val['status'] != 1){
             if($val['status'] != 1){
                 continue;
                 continue;
             }
             }