Merge remote-tracking branch 'origin/master' into akun

@@ -138,11 +138,15 @@ class OnlineController extends BaseController
                 $query->where('gl_project.title', 'like', '%' . $this->map['search'] . '%');
                 $query->where('gl_project.title', 'like', '%' . $this->map['search'] . '%');
             }
             }
         }
         }
-        if(isset($this->map['qa_status']) && !empty($this->map['qa_status'])){
+        if(isset($this->map['qa_status'])){
             // 搜索状态
             // 搜索状态
             $query->where('gl_project_online_check.qa_status',$this->map['qa_status']);
             $query->where('gl_project_online_check.qa_status',$this->map['qa_status']);
         }
         }
-        if(isset($this->map['optimist_status']) && !empty($this->map['optimist_status'])){
+        if(isset($this->map['all_status'])){
+            // 搜索状态
+            $query->where('gl_project_online_check.qa_status',$this->map['qa_status']);
+        }
+        if(isset($this->map['optimist_status'])){
             // 搜索状态
             // 搜索状态
             $query->where('gl_project_online_check.optimist_status',$this->map['optimist_status']);
             $query->where('gl_project_online_check.optimist_status',$this->map['optimist_status']);
         }
         }