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

赵彬吉
app/Http/Controllers/Aside/Project/ProjectController.php
--- a/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @02e619f
+++ b/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @02e619f
@@ -201,13 +201,13 @@ class ProjectController extends BaseController
      */
     public function searchChannel(&$query){
         if(isset($this->map['zone_id']) && !empty($this->map['zone_id'])){
-            $query->where('gl_project.channel','like','%"zone_id": "'.$this->map['channel_id'].'"%');
+            $query->where('gl_project.channel','like','%"zone_id": "'.$this->map['zone_id'].'"%');
         }
         if(isset($this->map['channel_id']) && !empty($this->map['channel_id'])){
             $query->where('gl_project.channel','like','%"channel_id": "'.$this->map['channel_id'].'"%');
         }
         if(isset($this->map['user_id']) && !empty($this->map['user_id'])){
-            $query->where('gl_project.channel','like','%"user_id": "'.$this->map['channel_id'].'"%');
+            $query->where('gl_project.channel','like','%"user_id": "'.$this->map['user_id'].'"%');
         }
         return $query;
     }