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

@@ -167,9 +167,11 @@ class ProjectController extends BaseController
     public function searchType(&$query){
     public function searchType(&$query){
         if(isset($this->map['type'])){
         if(isset($this->map['type'])){
             $query->where('gl_project.extend_type', '!=' ,5);
             $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{
+            } elseif ($this->map['type'] == 8){
+                $query->where('gl_project.online_check_id', null)->where('gl_project.type',Project::TYPE_TWO);
+            }else{
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
                 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
             }
             }
         }
         }