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

gx处理数据



查看合并请求 !2146

@@ -263,7 +263,7 @@ class OptimizeController extends BaseController
             $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']);
             $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']);
         }
         }
         if(isset($this->map['ai_domain']) && !empty($this->map['ai_domain'])){
         if(isset($this->map['ai_domain']) && !empty($this->map['ai_domain'])){
-            $query = $query->whereNotNull('gl_project_association.ai_domain');
+            $query = $query->whereNotNull('gl_domain_info.ai_domain');
         }
         }
         if(isset($this->map['amp_status'])){
         if(isset($this->map['amp_status'])){
             $query = $query->where('gl_domain_info.amp_status',$this->map['amp_status']);
             $query = $query->where('gl_domain_info.amp_status',$this->map['amp_status']);