合并分支 'master-lyh-edit' 到 'master'

项目搜索



查看合并请求 !628

@@ -168,13 +168,13 @@ 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'])){
             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{
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
             }
             }
-            $query->where('gl_project.extend_type', '!=' ,5);
         }
         }
         if(isset($this->map['uptime']) && is_array($this->map['uptime'])){
         if(isset($this->map['uptime']) && is_array($this->map['uptime'])){
             $query->whereBetween('gl_project.uptime', $this->map['uptime']);
             $query->whereBetween('gl_project.uptime', $this->map['uptime']);