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

合并产品搜索



查看合并请求 !970

@@ -18,6 +18,7 @@ use App\Models\Com\City;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Domain\DomainInfo;
 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\HomeCount\Count;
 use App\Models\HomeCount\Count;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
@@ -200,6 +201,12 @@ class ProjectController extends BaseController
      * @return mixed
      * @return mixed
      */
      */
     public function searchContent(&$query){
     public function searchContent(&$query){
+        if(!empty($this->map['domain'])){
+            $parsedUrl = parse_url($this->map['domain']);
+            $search = $parsedUrl['host'] ?? $this->map['search'];
+            $ids = DomainInfo::where('domain', 'like', '%'.$search.'%')->pluck('id')->toArray();
+            $query->whereIn('gl_project_deploy_optimize.domain', $ids);
+        }
         if(!empty($this->map['search']) && !empty($this->map['search_type'])){
         if(!empty($this->map['search']) && !empty($this->map['search_type'])){
             $query->where(function ($subQuery) {
             $query->where(function ($subQuery) {
                 // 搜索域名
                 // 搜索域名