Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java

@@ -46,6 +46,7 @@ import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static cn.hutool.core.collection.CollUtil.isEmpty;
 import static cn.hutool.core.collection.CollUtil.join;
 import static cn.hutool.core.date.DateField.HOUR_OF_DAY;
 import static cn.hutool.core.date.DateField.MINUTE;
@@ -597,7 +598,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
                         new DateRange(o.getFirstStartTime(), o.getFirstEndTime(), HOUR_OF_DAY),
                         new DateRange(o.getSecondStartTime(), o.getSecondEndTime(), HOUR_OF_DAY));
 
-                Assert.notEmpty(containsList, "无法正常排课，课次名称：【{},{}】 时间有重叠部分！", o.getFirstTagName(), o.getSecondTagName());
+                Assert.isTrue(isEmpty(containsList), "无法正常排课，课次名称：【{},{}】 时间有重叠部分！", o.getFirstTagName(), o.getSecondTagName());
             });
 
             // 取出来上午的时间，判断课次之间的断课情况