课表导出报错解决

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

@@ -1461,7 +1461,9 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                 classData.add(baseClass.getName());
                 for (Integer weeks : weekList) {
                     if(!weeksMap.containsKey(weeks)){
-                        classData.add("");
+                        for (ClassTime classTime : tableVo.getClassTimeList()) {
+                            classData.add("");
+                        }
                         continue;
                     }
                     Map<String, CourseDetailVo> timeNumberMap = weeksMap.get(weeks).stream().filter(x -> x.getTimeNumber() != null).collect(Collectors.toMap(CourseDetailVo::getTimeNumber, x -> x));
@@ -1471,7 +1473,11 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                             classData.add("");
                             continue;
                         }
-                        classData.add(courseDetailVo.getCourseName() + "\r\n" + courseDetailVo.getTeacherName() + "\n" + courseDetailVo.getClassroomName());
+                        String content = courseDetailVo.getCourseName() + "\r\n" + courseDetailVo.getTeacherName();
+                        if(courseDetailVo.getClassroomName() != null){
+                            content += "r\n" + courseDetailVo.getClassroomName();
+                        }
+                        classData.add(content);
                     }
                 }
                 dataList.add(classData);

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

@@ -132,7 +132,9 @@ public class CourseTableExportQueryUtil {
                         CourseDetailVo courseDetailVo = list.get(0);
                         content += courseDetailVo.getCourseName() + "\r\n";
                         if ("teacher".equals(courseType)) {
-                            content += courseDetailVo.getClassroomName() + "\r\n";
+                            if(courseDetailVo.getClassroomName() != null){
+                                content += courseDetailVo.getClassroomName() + "\r\n";
+                            }
                             content += courseDetailVo.getClassName();
                         } else if ("class".equals(courseType)) {
                             if(courseDetailVo.getClassroomName() != null){
@@ -148,7 +150,9 @@ public class CourseTableExportQueryUtil {
                         CourseDetailVo courseDetailVo = list.get(0);
                         content += courseDetailVo.getCourseName() + "\r\n";
                         if ("teacher".equals(courseType)) {
-                            content += courseDetailVo.getClassroomName() + "\r\n";
+                            if(courseDetailVo.getClassroomName() != null){
+                                content += courseDetailVo.getClassroomName() + "\r\n";
+                            }
                             content += courseDetailVo.getClassName();
                         } else if ("class".equals(courseType)) {
                             if(courseDetailVo.getClassroomName() != null){