gx脚本更新路由

@@ -199,28 +199,20 @@ 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']);
-            $domain = $parsedUrl['host'] ?? $this->map['domain'];
-            $ids = DomainInfo::where('domain', 'like', '%'.$domain.'%')->pluck('id')->toArray();
-            $query->whereIn('gl_project_deploy_optimize.domain', $ids);
+        if(!empty($this->map['domain_type']) && !empty($this->map['domain_search'])){
+            if($this->map['domain_type'] == 'domain'){
+                $parsedUrl = parse_url($this->map['domain_search']);
+                $this->map['domain_search'] = $parsedUrl['host'] ?? $this->map['domain_search'];
+                $ids = DomainInfo::where('domain', 'like', '%'.$this->map['domain_search'].'%')->pluck('id')->toArray();
+                $query->whereIn('gl_project_deploy_optimize.domain', $ids);
+            }else{
+                $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['domain_search'].'%');
+            }
         }
         }
         if(!empty($this->map['search']) && !empty($this->map['search_type'])){
         if(!empty($this->map['search']) && !empty($this->map['search_type'])){
-            $query->where(function ($subQuery) {
-                // 搜索域名
-                if ($this->map['search_type'] == 'domain') {
-                    $parsedUrl = parse_url($this->map['search']);
-                    $this->map['search'] = $parsedUrl['host'] ?? $this->map['search'];
-                    $ids = DomainInfo::where('domain', 'like', '%'.$this->map['search'].'%')->pluck('id')->toArray();
-                    $subQuery->whereIn('gl_project_deploy_optimize.domain', $ids);
-                } else if($this->map['search_type'] == 'test_domain'){
-                    $subQuery->where('gl_project_deploy_build.test_domain','like','%'.$this->map['search'].'%');
-                } else {
-                    // 搜索名称
-                    $subQuery->orwhere('gl_project.company','like','%'.$this->map['search'].'%')
-                        ->orwhere('gl_project.title','like','%'.$this->map['search'].'%');
-                }
-            });
+            // 搜索名称
+            $query->orwhere('gl_project.company','like','%'.$this->map['search'].'%')
+                ->orwhere('gl_project.title','like','%'.$this->map['search'].'%');
         }
         }
         return $query;
         return $query;
     }
     }