Merge remote-tracking branch 'origin/develop' into akun

@@ -155,12 +155,18 @@ class OptimizeController extends BaseController
         if(isset($this->map['optimize_assist_mid']) && !empty($this->map['optimize_assist_mid'])){
         if(isset($this->map['optimize_assist_mid']) && !empty($this->map['optimize_assist_mid'])){
             $query = $query->where('gl_project_deploy_optimize.assist_mid','like','%'.$this->map['optimize_assist_mid'].'%');
             $query = $query->where('gl_project_deploy_optimize.assist_mid','like','%'.$this->map['optimize_assist_mid'].'%');
         }
         }
-        if(isset($this->map['channel_id']) && !empty($this->map['channel_id'])){
+        if(isset($this->map['user_id']) && !empty($this->map['user_id'])){
             $query->where(function ($subQuery) {
             $query->where(function ($subQuery) {
-                $subQuery->orWhere('gl_project.channel','like','%"channel_id": "'.$this->map['channel_id'].'"%')
-                    ->orWhere('gl_project.channel','like','%"channel_id": '.$this->map['channel_id'].'%');
+                $subQuery->orWhere('gl_project.channel','like','%"user_id": "'.$this->map['user_id'].'"%')
+                    ->orWhere('gl_project.channel','like','%"user_id": '.$this->map['user_id'].'%');
             });
             });
         }
         }
+        if(isset($this->map['domain']) && !empty($this->map['domain'])){
+            $query = $query->where('gl_project_deploy_optimize.domain','like','%'.$this->map['domain'].'%');
+        }
+        if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
+            $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
+        }
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
         return $query;
         return $query;
     }
     }