diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java index d352b59b..9191e8fd 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java @@ -1148,6 +1148,7 @@ public class CourseInfoService extends CoreBaseService{ case MOVE_TOP: { List result = courseInfoDao.createLambdaQuery() .andEq(CourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType()) + .andEq(CourseInfo::getCourseInfoParentId, mergeCourseInfo.getCourseInfoParentId()) .andEq(CourseInfo::getCourseInfoStatus, 1) .andNotEq(CourseInfo::getCourseInfoId, id) .asc(CourseInfo::getOrderIndex) @@ -1169,6 +1170,7 @@ public class CourseInfoService extends CoreBaseService{ case MOVE_LEFT: { List result = courseInfoDao.createLambdaQuery() .andEq(CourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType()) + .andEq(CourseInfo::getCourseInfoParentId, mergeCourseInfo.getCourseInfoParentId()) .andLess(CourseInfo::getOrderIndex, defaultIfNull(mergeCourseInfo.getOrderIndex(), 50)) .andEq(CourseInfo::getCourseInfoStatus, 1) .andNotEq(CourseInfo::getCourseInfoId, id) @@ -1198,6 +1200,7 @@ public class CourseInfoService extends CoreBaseService{ case MOVE_RIGHT: { List result = courseInfoDao.createLambdaQuery() .andEq(CourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType()) + .andEq(CourseInfo::getCourseInfoParentId, mergeCourseInfo.getCourseInfoParentId()) .andGreat(CourseInfo::getOrderIndex, defaultIfNull(mergeCourseInfo.getOrderIndex(), 50)) .andEq(CourseInfo::getCourseInfoStatus, 1) .andNotEq(CourseInfo::getCourseInfoId, id) 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 5ee85ffd..3b1f4d78 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java @@ -1206,6 +1206,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService result = teacherOpenCourseMergeCourseInfoDao.createLambdaQuery() .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType()) + .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoParentId, mergeCourseInfo.getCourseInfoParentId()) .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1) .andNotEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId, id) .asc(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder)