1、课表预览增加教师名称搜索

2、冲突提示调整
3、课表总览增加默认分部

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

@@ -279,7 +279,9 @@ public class CourseScheduleController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        queryInfo.setOrganIdList(sysUser.getOrganId());
+        if(StringUtils.isEmpty(queryInfo.getOrganIdList())){
+            queryInfo.setOrganIdList(sysUser.getOrganId());
+        }
         return succeed(scheduleService.endFindCourseSchedules(queryInfo));
     }