课表导出

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -393,6 +393,9 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                 for (int i = 0; i < courseIds.length; i++) {
                     String courseId = courseIds[i];
                     String exchangeCourseId = exchangeCourseIds[i];
+                    if (StrUtil.isEmpty(exchangeCourseId)) {
+                        continue;
+                    }
 
                     //调课，将双方课程的日期（schedule_date）、时段（time_period）、节次（time_number）、周（week）、星期几(1-7)（weeks）、星期中文（weeks_cn）对调
                     CourseTable courseTable = courseMap.get(bakKeyInfoMap.get(Long.parseLong(courseId)));

src/main/java/com/xjrsoft/module/schedule/util/CourseTableExportQueryUtil.java

@@ -173,7 +173,7 @@ public class CourseTableExportQueryUtil {
         //合并
         Map<Integer, List<Integer>> collect = data.getClassTimeList().stream()
                 .collect(Collectors.groupingBy(ClassTime::getTimePeriod, Collectors.mapping(ClassTime::getNumber, Collectors.toList())));
-        int firstRow = 2;
+        int firstRow = rowNumber;
         for (Integer i : collect.keySet()) {
             int lastRow = firstRow + collect.get(i).size() - 1;
             if (lastRow == firstRow) {