diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
index 4a388722..3babb5bf 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
@@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
 import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
-import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.AssignID;
 
 import javax.validation.constraints.NotNull;
 
@@ -16,8 +16,8 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
     //ID
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
     // @SeqID(name = ORACLE_CORE_SEQ_NAME)
-//    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo")
-    @AutoID
+    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo")
+
     private Long teacherOpenCourseMergeResourcesInfoId ;
 	
     //开课课程ID
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java
index e09c9208..ab9c6309 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java
@@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
 import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
-import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.AssignID;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -17,8 +17,8 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{
     //ID
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
     // @SeqID(name = ORACLE_CORE_SEQ_NAME)
-//    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion")
-    @AutoID
+    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion")
+
     private Long teacherOpenCourseMergeResourcesQuestionId ;
 	
     //开课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 7e8be805..a1a7d334 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
@@ -459,6 +459,16 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         return teacherOpenCourseMergeCourseInfoDao.getExcelValues(teacherOpenCourseMergeCourseInfoQuery);
     }
 
+    /**
+     * 修改TeacherOpenCourseMergeCourseInfo的ID和parentId
+     * 生成新的ID，父级ID跟着变化
+     * @param copyToList
+     * @param parentId
+     */
+    public void batchUpdateSomeMergeId(List<TeacherOpenCourseMergeCourseInfo> copyToList, Long parentId) {
+
+    }
+
 
     /**
      * 教师端-导入课程章节操作，逻辑拆分
@@ -522,7 +532,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         // 开启并行处理
         courseInfoIds.stream().parallel().forEach(courseInfoId -> {
             // 获取这个课程章节下的所有的子章节信息
-            List<CourseInfo> chapterList = courseInfoService.getChapterList(Long.valueOf(courseInfoId));
+            List<CourseInfo> chapterList = courseInfoService.getChapterList(courseInfoId);
             HashSet<CourseInfo> courseInfos = CollectionUtil.newHashSet(chapterList);
 
             // 如果课程章节没查到记录，则下面的资源也没必要执行，资源依赖课程章节