wangwei 6 jaren geleden
bovenliggende
commit
af4285b02e

+ 5 - 1
examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/enums/CourseLevel.java

@@ -2,6 +2,8 @@ package cn.com.qmth.examcloud.core.basic.dao.enums;
 
 import org.apache.commons.lang3.StringUtils;
 
+import cn.com.qmth.examcloud.commons.base.exception.ExamCloudRuntimeException;
+
 /**
  * 重新定义
  *
@@ -48,6 +50,8 @@ public enum CourseLevel {
 				return cur;
 			}
 		}
-		return CourseLevel.ALL;
+
+		throw new ExamCloudRuntimeException("level name is wong");
 	}
+
 }

+ 11 - 5
examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/CourseServiceImpl.java

@@ -190,12 +190,18 @@ public class CourseServiceImpl implements CourseService {
 
 			couse.setCode(code);
 
-			try {
-				CourseLevel cl = CourseLevel.valueOf(trimAndNullIfBlank(line[2]));
-				couse.setLevel(cl);
-			} catch (Exception e) {
-				msg.append("  课程层次错误");
+			String level = trimAndNullIfBlank(line[2]);
+			if (StringUtils.isBlank(level)) {
+				msg.append("  课程层次不能为空");
 				hasError = true;
+			} else {
+				try {
+					CourseLevel cl = CourseLevel.getCourseLevel(level);
+					couse.setLevel(cl);
+				} catch (Exception e) {
+					msg.append("  课程层次错误");
+					hasError = true;
+				}
 			}
 
 			if (hasError) {