1

web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java

@@ -1148,6 +1148,7 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{
             case MOVE_TOP: {
                 List<CourseInfo> 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<CourseInfo>{
             case MOVE_LEFT: {
                 List<CourseInfo> 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<CourseInfo>{
             case MOVE_RIGHT: {
                 List<CourseInfo> 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)

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java

@@ -1206,6 +1206,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
             case MOVE_TOP: {
                 List<TeacherOpenCourseMergeCourseInfo> result = teacherOpenCourseMergeCourseInfoDao.createLambdaQuery()
                         .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType, mergeCourseInfo.getCourseInfoType())
+                        .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoParentId, mergeCourseInfo.getCourseInfoParentId())
                         .andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1)
                         .andNotEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId, id)
                         .asc(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder)