Merge branch 'li_huaweicloud' into testing

protected/controllers/ExportController.php

@@ -4148,7 +4148,7 @@ join class c on e.class_id = c.class_id where e.class_id = '{$classId}' and e.ex
         }
         //如果是物理去掉全学科的组卷
         if($searchProcessSubjectId == 12){
-            $con = array_merge($con, array('(eg.qxk_paper_id is null or eg.qxk_paper_id=0)'));
+           // $con = array_merge($con, array('(eg.qxk_paper_id is null or eg.qxk_paper_id=0)'));
         }
         
         $criteria->params[':semester_id'] = Yii::app()->session['session_semester_id'];