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

gx



查看合并请求 !2521

@@ -23,6 +23,7 @@ use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
+use App\Models\Geo\GeoLink;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\Industry\ProjectIndustry;
 use App\Models\Industry\ProjectIndustry;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
@@ -329,6 +330,15 @@ class ProjectController extends BaseController
         if(isset($this->map['project_type'])){
         if(isset($this->map['project_type'])){
             $query = $query->where('gl_project.project_type',$this->map['project_type']);
             $query = $query->where('gl_project.project_type',$this->map['project_type']);
         }
         }
+        if(isset($this->param['geo'])){
+            if($this->param['geo'] == 1){
+                    $query = $query->where('gl_project.geo_status',1);
+            }else{
+                $ids = GeoLink::pluck('project_id')->unique()->values()->all();
+                $query = $query->whereIn('gl_project.id',$ids);
+            }
+
+        }
         return $query;
         return $query;
     }
     }