Kaynağa Gözat

课时章节修复一些bug

honorfire 7 ay önce
ebeveyn
işleme
73271493eb

+ 23 - 10
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseChapterController.java

@@ -212,11 +212,14 @@ public class CourseChapterController {
         chapterService.addOne(chapter);
         //添加文件,测验等关联信息
         List<CourseRelate> courseRelates = chapterAddParam.getCourseRelates();
-        courseRelates = courseRelates.stream()
-                .peek(oneCourseRelate -> oneCourseRelate.setChapterhourType("0")) // 修改属性
-                .peek(oneCourseRelate -> oneCourseRelate.setMainId(chapter.getId())) // 修改属性
-                .collect(Collectors.toList());
-        courseRelateService.addBatch(courseRelates);
+        if(courseRelates.size()>0)
+        {
+            courseRelates = courseRelates.stream()
+                    .peek(oneCourseRelate -> oneCourseRelate.setChapterhourType("0")) // 修改属性
+                    .peek(oneCourseRelate -> oneCourseRelate.setMainId(chapter.getId())) // 修改属性
+                    .collect(Collectors.toList());
+            courseRelateService.addBatch(courseRelates);
+        }
         return CommonResult.ok();
     }
 
@@ -236,11 +239,21 @@ public class CourseChapterController {
         chapterService.editOne(chapter);
         //添加文件,测验等关联信息
         List<CourseRelate> courseRelates = chapterEditParam.getCourseRelates();
-        courseRelates = courseRelates.stream()
-                .peek(oneCourseRelate -> oneCourseRelate.setChapterhourType("0")) // 修改属性
-                .peek(oneCourseRelate -> oneCourseRelate.setMainId(chapter.getId())) // 修改属性
-                .collect(Collectors.toList());
-        courseRelateService.addBatch(courseRelates);
+        if(courseRelates.size()>0)
+        {
+            //先删除过往关联内容
+            Map relateParam =new HashMap();
+            relateParam.put("mainId", chapter.getId());
+            relateParam.put("chapterhourType","0");
+            List<CourseRelate> delCourseRelateList=courseRelateService.wrapperList(relateParam);
+            List<String> delCourseRelateIdList=CollStreamUtil.toList(delCourseRelateList, CourseRelate::getId);
+            courseRelateService.deleteByIds(delCourseRelateIdList);
+            courseRelates = courseRelates.stream()
+                    .peek(oneCourseRelate -> oneCourseRelate.setChapterhourType("0")) // 修改属性
+                    .peek(oneCourseRelate -> oneCourseRelate.setMainId(chapter.getId())) // 修改属性
+                    .collect(Collectors.toList());
+            courseRelateService.addBatch(courseRelates);
+        }
         return CommonResult.ok();
     }
 

+ 23 - 18
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseClassHourController.java

@@ -96,11 +96,14 @@ public class CourseClassHourController {
         classHourService.addOne(classHour);
         //添加文件,测验等关联信息
         List<CourseRelate> courseRelates = classHourAddParam.getCourseRelates();
-        courseRelates = courseRelates.stream()
-                .peek(oneCourseRelate -> oneCourseRelate.setChapterhourType("1")) // 修改属性
-                .peek(oneCourseRelate -> oneCourseRelate.setMainId(classHour.getId())) // 修改属性
-                .collect(Collectors.toList());
-        courseRelateService.addBatch(courseRelates);
+        if(courseRelates.size()>0)
+        {
+            courseRelates = courseRelates.stream()
+                    .peek(oneCourseRelate -> oneCourseRelate.setChapterhourType("1")) // 修改属性
+                    .peek(oneCourseRelate -> oneCourseRelate.setMainId(classHour.getId())) // 修改属性
+                    .collect(Collectors.toList());
+            courseRelateService.addBatch(courseRelates);
+        }
         return CommonResult.ok();
     }
 
@@ -118,21 +121,23 @@ public class CourseClassHourController {
         ClassHour classHour = classHourService.queryEntity(classHourEditParam.getId());
         BeanUtil.copyProperties(classHourEditParam, classHour);
         classHourService.editOne(classHour);
-        //先删除过往关联内容
-        Map relateParam =new HashMap();
-        relateParam.put("mainId", classHour.getId());
-        relateParam.put("chapterhourType","0");
-        List<CourseRelate> delCourseRelateList=courseRelateService.wrapperList(relateParam);
-        List<String> delCourseRelateIdList=CollStreamUtil.toList(delCourseRelateList, CourseRelate::getId);
-        courseRelateService.deleteByIds(delCourseRelateIdList);
         //重新添加关联内容
         List<CourseRelate> courseRelates = classHourEditParam.getCourseRelates();
-        courseRelates = courseRelates.stream()
-                .peek(oneCourseRelate -> oneCourseRelate.setChapterhourType("1"))
-                .peek(oneCourseRelate -> oneCourseRelate.setMainId(classHour.getId())) // 修改属性
-                .collect(Collectors.toList());
-        courseRelateService.addBatch(courseRelates);
-
+        if(courseRelates.size()>0)
+        {
+            //先删除过往关联内容
+            Map relateParam =new HashMap();
+            relateParam.put("mainId", classHour.getId());
+            relateParam.put("chapterhourType","0");
+            List<CourseRelate> delCourseRelateList=courseRelateService.wrapperList(relateParam);
+            List<String> delCourseRelateIdList=CollStreamUtil.toList(delCourseRelateList, CourseRelate::getId);
+            courseRelateService.deleteByIds(delCourseRelateIdList);
+            courseRelates = courseRelates.stream()
+                    .peek(oneCourseRelate -> oneCourseRelate.setChapterhourType("1"))
+                    .peek(oneCourseRelate -> oneCourseRelate.setMainId(classHour.getId())) // 修改属性
+                    .collect(Collectors.toList());
+            courseRelateService.addBatch(courseRelates);
+        }
         return CommonResult.ok();
     }