|
@@ -71,21 +71,20 @@ public class CourseCloudServiceProvider implements CourseCloudService {
|
|
throw new StatusException("B-160004", "courseCode is null");
|
|
throw new StatusException("B-160004", "courseCode is null");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ Course course = null;
|
|
List<Course> list = courseRepo.findAllByOrgIdAndCode(rootOrgId, courseCode);
|
|
List<Course> list = courseRepo.findAllByOrgIdAndCode(rootOrgId, courseCode);
|
|
if (1 < list.size()) {
|
|
if (1 < list.size()) {
|
|
throw new StatusException("B-160005", "存在课程编码重复的数据. courseCode: " + courseCode);
|
|
throw new StatusException("B-160005", "存在课程编码重复的数据. courseCode: " + courseCode);
|
|
- }
|
|
|
|
-
|
|
|
|
- Course course = courseRepo.findByOrgIdAndCode(rootOrgId, courseCode);
|
|
|
|
- if (course == null) {
|
|
|
|
|
|
+ } else if (1 == list.size()) {
|
|
|
|
+ course = list.get(0);
|
|
|
|
+ if (null == course.getEnable()) {
|
|
|
|
+ course.setEnable(true);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
course = new Course();
|
|
course = new Course();
|
|
course.setOrgId(courseReq.getRootOrgId());
|
|
course.setOrgId(courseReq.getRootOrgId());
|
|
course.setCode(courseReq.getCourseCode());
|
|
course.setCode(courseReq.getCourseCode());
|
|
course.setEnable(true);
|
|
course.setEnable(true);
|
|
- } else {
|
|
|
|
- if (null == course.getEnable()) {
|
|
|
|
- course.setEnable(true);
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
if (null != courseReq.getEnable()) {
|
|
if (null != courseReq.getEnable()) {
|