Browse Source

1、课表预览增加教师名称搜索
2、冲突提示调整

Joburgess 5 năm trước cách đây
mục cha
commit
6c399a5641

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -811,6 +811,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         errInfo.append("安排的课程存在冲突,");
         errInfo.append("冲突课程为:");
 
+        if (Objects.isNull(preCourseSchedule.getId()) && Objects.isNull(backCourseSchedule.getId())) {
+            errInfo.setLength(0);
+            errInfo.append("您设置的循环周期存在时间冲突");
+            return errInfo.toString();
+        }
+
         CourseSchedule courseSchedule = new CourseSchedule();
         if (Objects.nonNull(preCourseSchedule.getId()) && existCourseScheduleIds.contains(preCourseSchedule.getId())) {
             courseSchedule = preCourseSchedule;
@@ -843,6 +849,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         errInfo.append("(");
         errInfo.append(courseSchedule.getId());
         errInfo.append(")");
+
         errInfo.append("类型为:");
         switch (type) {
             case 1: