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

Lyh server



查看合并请求 !3253

@@ -271,11 +271,11 @@ class OptimizeController extends BaseController
             if($this->map['seo_plan'] == 0){
             if($this->map['seo_plan'] == 0){
                 $query = $query->where('gl_project_deploy_build.plan','!=',0);
                 $query = $query->where('gl_project_deploy_build.plan','!=',0);
             }elseif(is_array($this->map['seo_plan'])){
             }elseif(is_array($this->map['seo_plan'])){
-                $query = $query->whereIn('gl_project_deploy_build.seo_plan',$this->map['seo_plan'])
-                    ->where(function ($subQuery) {
-                    $subQuery->where('gl_project_deploy_build.plan', '=', 0)
-                        ->orWhere('gl_project_deploy_build.seo_plan', '!=', 9);
-                });;
+                $query = $query->whereIn('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
+//                    ->where(function ($subQuery) {
+//                    $subQuery->where('gl_project_deploy_build.plan', '=', 0)
+//                        ->orWhere('gl_project_deploy_build.seo_plan', '!=', 9);
+//                });
             }else{
             }else{
                 $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
                 $query = $query->where('gl_project_deploy_build.seo_plan',$this->map['seo_plan']);
             }
             }

@@ -332,11 +332,11 @@ class ProjectController extends BaseController
             }
             }
         }
         }
         if (isset($this->map['seo_plan'])) {
         if (isset($this->map['seo_plan'])) {
-            $query = $query->where('gl_project_deploy_build.seo_plan', '!=', 0)
-                ->where(function ($subQuery) {
-                    $subQuery->where('gl_project_deploy_build.plan', '=', 0)
-                        ->orWhere('gl_project_deploy_build.seo_plan', '!=', 9);
-                });
+            $query = $query->where('gl_project_deploy_build.seo_plan', '!=', 0);
+//                ->where(function ($subQuery) {
+//                    $subQuery->where('gl_project_deploy_build.plan', '=', 0)
+//                        ->orWhere('gl_project_deploy_build.seo_plan', '!=', 9);
+//                });
         }
         }
         if (isset($this->map['site_status'])) {
         if (isset($this->map['site_status'])) {
             $query = $query->where('gl_project.site_status', $this->map['site_status']);
             $query = $query->where('gl_project.site_status', $this->map['site_status']);