...

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/CourseCloudServiceProvider.java

@@ -5,11 +5,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveCourseReq;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
+import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.basic.service.impl.CourseService;
 import io.swagger.annotations.ApiOperation;
 
@@ -20,15 +19,15 @@ public class CourseCloudServiceProvider implements CourseCloudService {
 	@Autowired
 	CourseService courseService;
 
-	@ApiOperation(value = "保存课程", notes = "保存课程")
+	@ApiOperation(value = "保存课程")
 	@PostMapping
 	@Override
 	public void saveCourse(SaveCourseReq courseReq) {
-		Course course = courseService.findByOrgIdAndCode(courseReq.getOrgId(),
+		Course course = courseService.findByOrgIdAndCode(courseReq.getRootOrgId(),
 				courseReq.getCourseCode());
 		if (course == null) {
 			course = new Course();
-			course.setOrgId(courseReq.getOrgId());
+			course.setOrgId(courseReq.getRootOrgId());
 			course.setName(courseReq.getCourseName());
 			course.setCode(courseReq.getCourseCode());
 			course.setLevel(getCourseLevelByCName(courseReq.getCourseLevel()));
@@ -41,10 +40,12 @@ public class CourseCloudServiceProvider implements CourseCloudService {
 		for (CourseLevel level : CourseLevel.values()) {
 			if (cname.equals(level.getName())) {
 				courseLevel = level;
+				break;
 			}
 		}
+
 		if (courseLevel == null) {
-			throw new StatusException("CORE-BASIC-courseLevel not exists", "课程层次不存在");
+			return CourseLevel.ALL;
 		} else {
 			return courseLevel;
 		}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveCourseReq.java

@@ -2,23 +2,37 @@ package cn.com.qmth.examcloud.core.basic.api.request;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
 
-public class SaveCourseReq  extends BaseRequest {
-	
+public class SaveCourseReq extends BaseRequest {
+
 	private static final long serialVersionUID = -814368725579588751L;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
 	/**
 	 * 课程code
 	 */
 	private String courseCode;
+
 	/**
 	 * 课程name
 	 */
 	private String courseName;
+
 	/**
 	 * 课程level
 	 */
 	private String courseLevel;
-	
-	private Long orgId;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
 
 	public String getCourseCode() {
 		return courseCode;
@@ -44,12 +58,4 @@ public class SaveCourseReq  extends BaseRequest {
 		this.courseLevel = courseLevel;
 	}
 
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-	
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Course.java

@@ -12,9 +12,9 @@ import javax.validation.constraints.NotNull;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelProperty;
 import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
 
 /**
  * 

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

@@ -6,17 +6,17 @@ public enum CourseLevel {
 
 	GQZ("高起专"),
 
-    GQB("高起本"),
-	
+	GQB("高起本"),
+
 	ALL("");
-	
-    private String name;
 
-    private CourseLevel(String name){
-        this.name = name;
-    }
+	private String name;
+
+	private CourseLevel(String name) {
+		this.name = name;
+	}
 
-    public String getName(){
-        return this.name;
-    }
+	public String getName() {
+		return this.name;
+	}
 }

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/CourseService.java

@@ -19,13 +19,13 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReader;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReaderHandle;
 import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
 import cn.com.qmth.examcloud.core.basic.dao.entity.CourseSpeciatly;
+import cn.com.qmth.examcloud.core.basic.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.basic.service.bean.CourseDto;
 
 @Service