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

gx处理数据



查看合并请求 !2148

@@ -174,7 +174,7 @@ class ProjectController extends BaseController
      */
     public function searchType(&$query){
         if(isset($this->map['type'])){
-            $query->where('gl_project.extend_type', '!=' ,5);
+            $query->where('gl_project.extend_type', '!=' ,5)->where('gl_project.extend_type', '!=' ,8);
             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']);
             } elseif ($this->map['type'] == 8){