Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -339,7 +339,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             while (highClassGroup.getCourseTimes() >= times) {
                 int dayOfWeek = now.getDayOfWeek().getValue();
-                if (highClassGroup.getDayOfWeek().equals(dayOfWeek)) {
+                if (highClassGroup.getDayOfWeek() == dayOfWeek) {
                     CourseSchedule courseSchedule = new CourseSchedule();
                     Instant instant = now.atZone(ZoneId.systemDefault()).toInstant();
                     Date classDate = Date.from(instant);
@@ -367,7 +367,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 now = now.plusDays(1);
             }
             //检测新排课冲突
-            courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
+            //courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
             courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
 
             List<Integer> userIdList = new ArrayList<>();