Merge remote-tracking branch 'origin/master'

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:
@@ -2214,8 +2221,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                         result.setGroupName(groupTemps.get(0).getGroupName());
                         result.setOrganName(groupTemps.get(0).getOrganName());
                     }
-                    result.setTeacherName(nameIdMap.get(result.getActualTeacherId()));
                 }
+                result.setTeacherName(nameIdMap.get(result.getActualTeacherId()));
                 List<TeacherAttendance> courseTeacherAttendances = courseTeacherAttendanceMap.get(result.getId());
                 if(!CollectionUtils.isEmpty(courseTeacherAttendances)){
                     TeacherAttendance teacherAttendance=courseTeacherAttendances.get(0);

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -275,6 +275,13 @@ public class CourseScheduleController extends BaseController {
     @GetMapping("/superFindCourseSchedules")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/superFindCourseSchedules')")
     public Object superFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if(StringUtils.isEmpty(queryInfo.getOrganIdList())){
+            queryInfo.setOrganIdList(sysUser.getOrganId());
+        }
         return succeed(scheduleService.endFindCourseSchedules(queryInfo));
     }