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

@@ -168,8 +168,8 @@ class ProjectController extends BaseController
      * @return mixed
      * @return mixed
      */
      */
     public function searchType(&$query){
     public function searchType(&$query){
-        $query->where('gl_project.extend_type', '!=' ,5);
         if(isset($this->map['type'])){
         if(isset($this->map['type'])){
+            $query->where('gl_project.extend_type', '!=' ,5);
             if (in_array($this->map['type'], [Project::TYPE_ZERO, Project::TYPE_ONE, Project::TYPE_TWO, Project::TYPE_THREE]))
             if (in_array($this->map['type'], [Project::TYPE_ZERO, Project::TYPE_ONE, Project::TYPE_TWO, Project::TYPE_THREE]))
                 $query->where('gl_project.type', $this->map['type']);
                 $query->where('gl_project.type', $this->map['type']);
             else{
             else{