Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-core-examwork.git

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamStudentServiceImpl.java

@@ -836,8 +836,12 @@ public class ExamStudentServiceImpl implements ExamStudentService {
 		 * 进入考试时，判断正常考试次数是否小于考试信息(ecs_exam)中的考试次数 如果是，考试次数加一，将重考标识设置成false
 		 */
 		long examTimes = examStudent.getExam().getExamTimes();
-		if (examTimes > examStudent.getNormalExamTimes()) {
-			examStudent.setNormalExamTimes(examStudent.getNormalExamTimes() + 1);
+		Integer normalExamTimes = examStudent.getNormalExamTimes();
+		if(normalExamTimes == null){
+			normalExamTimes = 0;
+		}
+		if (examTimes > normalExamTimes) {
+			examStudent.setNormalExamTimes(normalExamTimes.intValue() + 1);
 			examStudent.setIsReexamine(null);
 			examStudent.setReexamineCompleted(null);
 		}