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

Lyh server



查看合并请求 !2986

@@ -127,6 +127,7 @@ class CountLogic extends BaseLogic
         if(!empty($version) && ($version == '7.5')){
         if(!empty($version) && ($version == '7.5')){
             $geoCountModel = new GeoCount();
             $geoCountModel = new GeoCount();
             $geoInfo = $geoCountModel->where('project_id',$this->user['project_id'])->where('date', '<=', date('Y-m-d'))->orderBy('date', 'desc')->first();
             $geoInfo = $geoCountModel->where('project_id',$this->user['project_id'])->where('date', '<=', date('Y-m-d'))->orderBy('date', 'desc')->first();
+            $geoInfo = $geoInfo ? $geoInfo->toArray() : [];
             $data['geo_qualify_total'] = $geoInfo['qualify_total'] ?? 0;
             $data['geo_qualify_total'] = $geoInfo['qualify_total'] ?? 0;
             $data['total_count'] = ($this->project['deploy_build']['keyword_num'] ?? 0) + ($this->project['geo_qualify_day'] ?? 0);
             $data['total_count'] = ($this->project['deploy_build']['keyword_num'] ?? 0) + ($this->project['geo_qualify_day'] ?? 0);
         }
         }