wangwei 6 years ago
parent
commit
56e080d19c

+ 8 - 2
examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -275,7 +275,7 @@ public class ExamController extends ControllerSupport {
 
 		examInfo.setBeginTime(domain.getBeginTime());
 		examInfo.setDuration(domain.getDuration());
-		examInfo.setEnable(true);
+		examInfo.setEnable(domain.getEnable());
 		examInfo.setEndTime(domain.getEndTime());
 		examInfo.setExamTimes(domain.getExamTimes());
 		examInfo.setExamType(domain.getExamType());
@@ -285,6 +285,9 @@ public class ExamController extends ControllerSupport {
 		examInfo.setRootOrgId(accessUser.getRootOrgId());
 
 		Map<String, String> properties = domain.getProperties();
+		if (null == properties) {
+			properties = Maps.newHashMap();
+		}
 		examInfo.setProperties(properties);
 
 		ExamEntity saved = examService.saveExam(examInfo);
@@ -309,7 +312,7 @@ public class ExamController extends ControllerSupport {
 		ExamInfo examInfo = new ExamInfo();
 		examInfo.setBeginTime(domain.getBeginTime());
 		examInfo.setDuration(domain.getDuration());
-		examInfo.setEnable(true);
+		examInfo.setEnable(domain.getEnable());
 		examInfo.setEndTime(domain.getEndTime());
 		examInfo.setExamTimes(domain.getExamTimes());
 		examInfo.setExamType(domain.getExamType());
@@ -319,6 +322,9 @@ public class ExamController extends ControllerSupport {
 		examInfo.setRootOrgId(accessUser.getRootOrgId());
 
 		Map<String, String> properties = domain.getProperties();
+		if (null == properties) {
+			properties = Maps.newHashMap();
+		}
 		examInfo.setProperties(properties);
 
 		ExamEntity saved = examService.saveExam(examInfo);