周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 cb30846773d2343a29f72e591efe6e11a68cd275 1 个父辈 bf0ef700

gx处理数据

内嵌 并排对比
正在显示 2 个修改的文件 包含 3 行增加 和 5 行删除
@@ -262,6 +262,9 @@ class OptimizeController extends BaseController @@ -262,6 +262,9 @@ class OptimizeController extends BaseController
262 if(isset($this->map['ai_video']) && !empty($this->map['ai_video'])){ 262 if(isset($this->map['ai_video']) && !empty($this->map['ai_video'])){
263 $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']); 263 $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']);
264 } 264 }
  265 + if(isset($this->map['ai_domain']) && !empty($this->map['ai_domain'])){
  266 + $query = $query->whereNotNull('gl_project_association.ai_domain');
  267 + }
265 if(isset($this->map['amp_status'])){ 268 if(isset($this->map['amp_status'])){
266 $query = $query->where('gl_domain_info.amp_status',$this->map['amp_status']); 269 $query = $query->where('gl_domain_info.amp_status',$this->map['amp_status']);
267 } 270 }
@@ -62,7 +62,6 @@ class ProjectController extends BaseController @@ -62,7 +62,6 @@ class ProjectController extends BaseController
62 ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id') 62 ->leftJoin('gl_project_online_check', 'gl_project.id', '=', 'gl_project_online_check.project_id')
63 ->leftJoin('gl_web_setting_template', 'gl_project.id', '=', 'gl_web_setting_template.project_id') 63 ->leftJoin('gl_web_setting_template', 'gl_project.id', '=', 'gl_web_setting_template.project_id')
64 ->leftJoin('gl_project_association', 'gl_project.id', '=', 'gl_project_association.project_id') 64 ->leftJoin('gl_project_association', 'gl_project.id', '=', 'gl_project_association.project_id')
65 - ->leftJoin('gl_domain_info', 'gl_project.id', '=', 'gl_domain_info.project_id')  
66 ->where('gl_project.delete_status',Project::TYPE_ZERO); 65 ->where('gl_project.delete_status',Project::TYPE_ZERO);
67 $query = $this->searchParam($query); 66 $query = $this->searchParam($query);
68 $query = $this->orderByList($query); 67 $query = $this->orderByList($query);
@@ -125,7 +124,6 @@ class ProjectController extends BaseController @@ -125,7 +124,6 @@ class ProjectController extends BaseController
125 'gl_project_deploy_optimize.api_no AS api_no', 124 'gl_project_deploy_optimize.api_no AS api_no',
126 'gl_web_setting_template.template_id AS template_id', 125 'gl_web_setting_template.template_id AS template_id',
127 'gl_project_association.friend_id as friend_id', 126 'gl_project_association.friend_id as friend_id',
128 - 'gl_domain_info.ai_domain as ai_domain'  
129 ]; 127 ];
130 return $select; 128 return $select;
131 } 129 }
@@ -299,9 +297,6 @@ class ProjectController extends BaseController @@ -299,9 +297,6 @@ class ProjectController extends BaseController
299 if(isset($this->map['plan'])){ 297 if(isset($this->map['plan'])){
300 $query = $query->where('gl_project_deploy_build.plan',$this->map['plan']); 298 $query = $query->where('gl_project_deploy_build.plan',$this->map['plan']);
301 } 299 }
302 - if(isset($this->map['ai_domain'])){  
303 - $query = $query->whereNotNull('gl_domain_info.ai_domain');  
304 - }  
305 if(isset($this->map['friend_id'])){ 300 if(isset($this->map['friend_id'])){
306 if($this->map['friend_id'] == 1){ 301 if($this->map['friend_id'] == 1){
307 $query = $query->where('gl_project_association.friend_id', '!=', 0); 302 $query = $query->where('gl_project_association.friend_id', '!=', 0);