fix

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/SubjectController.java

@@ -152,13 +152,13 @@ public class SubjectController extends BaseExamController {
 			MultipartFile file, @RequestParam Integer schoolId, @RequestParam Integer examId) {
 		try {
 			School s = schoolService.findById(schoolId);
-			ImportExcel ei= new ImportExcel(file, 1, 0);
-			List<SubjectSplit> list = ei.getDataList(SubjectSplit.class);
 			model.addAttribute("examId", examId);
 			model.addAttribute("schoolId", schoolId);
 			model.addAttribute("schoolName", s.getName());
 			List<Exam> examList = examService.findBySchoolId(schoolId);
 			model.addAttribute("examList", examList);
+			ImportExcel ei= new ImportExcel(file, 1, 0);
+			List<SubjectSplit> list = ei.getDataList(SubjectSplit.class);
 			String errMsg=subjectService.split(schoolId,examId,list);
 			if(StringUtils.isBlank(errMsg)) {
 				model.addAttribute("message", "已成功导入");

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/subjectSplit.jsp

@@ -7,6 +7,21 @@
     <%@include file="/WEB-INF/views/include/head.jsp" %>
     <script type="text/javascript">
         $(document).ready(function () {
+         	$("#uploadFile").change(function (e) {
+         		var ob=e.currentTarget.files[0];
+                var size = ob.size;
+                var name=ob.name.toLowerCase();
+               	if(!name.endsWith(".xls")&&!name.endsWith(".xlsx")){
+               		alert("仅允许导入“xls”或“xlsx”格式文件");
+                	$("#uploadFile").val(null);
+                	return;
+               	}
+                if(size>10485760){
+                	alert("文件大小不能超过10M");
+                	$("#uploadFile").val(null);
+                	return;
+                }
+            }); 
             $("#inputForm").validate({
                 submitHandler: function (form) {
                 	$("#btnSubmit").attr("disabled","disabled")