diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
index 237b22cb..83e87ae2 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
@@ -57,10 +57,11 @@ public class CourseContentServiceImpl implements ICourseContentService {
 			//新增的情况
 			cc.setDeleted(false);
 			if (cc.getDuration()==null){
-				if (exam != null){
-					cc.setDuration(exam.getTestDuration()*60);
-				}else {
-					cc.setDuration(0);
+				cc.setDuration(0);
+			}
+			if(exam!=null) {
+				if (exam.getTestDuration()!=null) {
+					cc.setDuration(exam.getTestDuration() * 60);
 				}
 			}
 			//如果是没有目录的，并具是课程内容
@@ -72,8 +73,10 @@ public class CourseContentServiceImpl implements ICourseContentService {
 			}
 			ccDao.save(cc);
 		}else {
-			if (cc.getDuration()!=null) {
-				cc.setDuration(cc.getDuration());
+			if(exam!=null) {
+				if (exam.getTestDuration()!=null) {
+					cc.setDuration(exam.getTestDuration() * 60);
+				}
 			}
 			ccDao.update(cc);
 			cc.setSysVersion(ccDao.getVersion(cc.getId()));