Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -273,6 +273,9 @@ class ProjectController extends BaseController
         if(isset($this->map['optimize_optimist_mid'])){
         if(isset($this->map['optimize_optimist_mid'])){
             $query = $query->where('gl_project_deploy_optimize.optimist_mid',$this->map['optimize_optimist_mid']);
             $query = $query->where('gl_project_deploy_optimize.optimist_mid',$this->map['optimize_optimist_mid']);
         }
         }
+        if(isset($this->map['plan'])){
+            $query = $query->where('gl_project_deploy_build.plan',$this->map['plan']);
+        }
         return $query;
         return $query;
     }
     }
 
 

@@ -159,6 +159,7 @@ class ProductController extends BaseController
             $query = $query->whereIn('id',$product_id_arr);
             $query = $query->whereIn('id',$product_id_arr);
         }
         }
         if(isset($this->map['title']) && !empty($this->map['title'])){
         if(isset($this->map['title']) && !empty($this->map['title'])){
+            $this->map['title'] = str_replace('+',' ',$this->map['title']);
             $query = $query->where('title','like','%'.$this->map['title'].'%');
             $query = $query->where('title','like','%'.$this->map['title'].'%');
         }
         }
         if(isset($this->map['status'])){
         if(isset($this->map['status'])){