|
@@ -195,7 +195,7 @@ public class CourseScheduleController extends BaseController {
|
|
if(Objects.isNull(oldCourseSchedule)){
|
|
if(Objects.isNull(oldCourseSchedule)){
|
|
return failed("未找到指定课程");
|
|
return failed("未找到指定课程");
|
|
}
|
|
}
|
|
- if(Objects.nonNull(oldCourseSchedule.getNewCourseId())){
|
|
|
|
|
|
+ if(Objects.nonNull(oldCourseSchedule.getNewCourseId())&&!oldCourseSchedule.getNewCourseId().equals(oldCourseSchedule.getId())){
|
|
return failed("被合并课程禁止调整");
|
|
return failed("被合并课程禁止调整");
|
|
}
|
|
}
|
|
if(GroupType.VIP.equals(oldCourseSchedule.getGroupType())){
|
|
if(GroupType.VIP.equals(oldCourseSchedule.getGroupType())){
|