gx

@@ -136,12 +136,30 @@ class OptimizeController extends BaseController
      */
      */
     public function searchParam(&$query){
     public function searchParam(&$query){
         //搜索条件处理
         //搜索条件处理
-        if(isset($this->map['title'])){
+        if(isset($this->map['title']) && !empty($this->map['title'])){
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         }
-        if(isset($this->map['special'])){
+        if(isset($this->map['special']) && !empty($this->map['special'])){
             $query = $query->where('gl_project_deploy_optimize.special','like','%'.$this->map['special'].'%');
             $query = $query->where('gl_project_deploy_optimize.special','like','%'.$this->map['special'].'%');
         }
         }
+        if(isset($this->map['manager_mid']) && !empty($this->map['manager_mid'])){
+            $query = $query->where('gl_project_deploy_build.manager_mid','like','%'.$this->map['manager_mid'].'%');
+        }
+        if(isset($this->map['optimize_manager_mid']) && !empty($this->map['optimize_manager_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.manager_mid','like','%'.$this->map['optimize_manager_mid'].'%');
+        }
+        if(isset($this->map['optimize_tech_mid']) && !empty($this->map['optimize_tech_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.tech_mid','like','%'.$this->map['optimize_tech_mid'].'%');
+        }
+        if(isset($this->map['optimize_optimist_mid']) && !empty($this->map['optimize_optimist_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.optimist_mid','like','%'.$this->map['optimize_optimist_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'].'%');
+        }
+        if(isset($this->map['channel_id']) && !empty($this->map['channel_id'])){
+            $query = $query->where('gl_project.channel','like','%"channel_id":"'.$this->map['channel_id'].'"%');
+        }
         $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;
     }
     }