3 Commits 09ac9bf074 ... d79844aad5

Author SHA1 Message Date
  24753255@qq.com d79844aad5 Merge branch 'testing' of http://gitz.zhixinhuixue.net:18880/zxhx/xiaoben-as2-php into testing 5 months ago
  24753255@qq.com 6c1f8954ce Merge branch 'li_huaweicloud' into testing 5 months ago
  24753255@qq.com 4ba8bdb3c7 物理全学科批量下载 5 months ago
1 changed files with 1 additions and 1 deletions
  1. 1 1
      protected/controllers/ExportController.php

+ 1 - 1
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'];