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

更新修改



查看合并请求 !891

@@ -11,6 +11,7 @@ namespace App\Http\Controllers\Aside\Project;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
+use App\Models\Domain\DomainInfo;
 use App\Models\Project\CountAllProject;
 use App\Models\Project\CountAllProject;
 
 
 /**
 /**
@@ -30,6 +31,14 @@ class AllProjectController extends BaseController
      * @time   :2024/11/12 9:35
      * @time   :2024/11/12 9:35
      */
      */
     public function lists(CountAllProject $allProject){
     public function lists(CountAllProject $allProject){
+        if(isset($this->map['product_domain']) && !empty($this->map['product_domain'])){
+            $parsedUrl = parse_url($this->map['product_domain']);
+            $this->map['product_domain'] = $parsedUrl['host'] ?? $this->map['product_domain'];
+            $this->map['product_domain'] = ['like','%'.$this->map['product_domain'].'%'];
+        }
+        if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
+            $this->map['test_domain'] = ['like','%'.$this->map['test_domain'].'%'];
+        }
         $data = $allProject->lists($this->map,$this->page,$this->row);
         $data = $allProject->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }