diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java index 47c1133d..8a0dd27c 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java @@ -933,7 +933,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService result){ for (TeacherOpenCourseMergeCourseInfo courseInfo : courseInfoList) { // 防止死循环,过滤掉父类ID是他自己的情况 - if(!filterTeacherOpenCourseMergeCourseInfoId.equals(courseInfo.getTeacherOpenCourseMergeCourseInfoId()) + if(!courseInfo.getCourseInfoParentId().equals(courseInfo.getTeacherOpenCourseMergeCourseInfoId()) && courseInfo.getCourseInfoParentId() != null && courseInfo.getCourseInfoParentId().equals(filterTeacherOpenCourseMergeCourseInfoId)) { result.add(courseInfo); getCourseResourcesByList(courseInfoList, courseInfo.getTeacherOpenCourseMergeCourseInfoId(), result);