From ab490e4156d5a1025dcc66b99978fac4fd7381ce Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Mon, 14 Nov 2022 11:08:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E7=9B=AE=E9=85=8D=E7=BD=AE=E5=B8=A6?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=BF=AB=E7=85=A7=E7=9C=9F=E5=AE=9E=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseMergeCourseInfoService.java   |  2 +-
 .../TeacherOpenCourseQuestionSettingService.java   | 14 +++++++++++---
 ...TeacherOpenCourseQuestionSettingController.java |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

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 8a0dd27c..8140a016 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
@@ -166,7 +166,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
                         .map(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId).collect(toSet());
 
                 if(ObjectUtil.isNotEmpty(idSet)) {
-                    teacherOpenCourseQuestionSettingService.deleteTeacherOpenCourseQuestionSetting(join(idSet.toArray(), ","));
+                    teacherOpenCourseQuestionSettingService.deleteWithQuestionSnapByIds(join(idSet.toArray(), ","));
                 }
             }
             teacherOpenCourseMergeCourseInfoDao.deleteTeacherOpenCourseMergeCourseInfoByIds(ids);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
index 624a1864..a98f8c36 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
@@ -79,7 +79,16 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
         }
     }
 
-    public void deleteTeacherOpenCourseQuestionSetting(String ids){
+    public void deleteByIds(@NotEmpty String ids) {
+        teacherOpenCourseQuestionSettingDao.deleteByIds(ids);
+    }
+
+    public void deleteWithQuestionSnapByIds(@NotEmpty String settingIds) {
+        teacherOpenCourseQuestionSettingDao.deleteByIds(settingIds);
+        resourcesQuestionSnapshotService.deleteByTeacherOpenCourseQuestionSettingIds(settingIds);
+    }
+
+    public void logicDeleteTeacherOpenCourseQuestionSetting(String ids){
         try {
             teacherOpenCourseQuestionSettingDao.deleteTeacherOpenCourseQuestionSettingByIds(ids);
         } catch (Exception e) {
@@ -257,8 +266,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
         // 编辑操作
         if(ObjectUtil.isNotEmpty(settingQuery.getTeacherOpenCourseQuestionSettingId())) {
             String editSettingIds = settingQuery.getTeacherOpenCourseQuestionSettingId().toString();
-            teacherOpenCourseQuestionSettingDao.deleteByIds(editSettingIds);
-            resourcesQuestionSnapshotService.deleteByTeacherOpenCourseQuestionSettingIds(editSettingIds);
+            deleteWithQuestionSnapByIds(editSettingIds);
             // 删除主键，用于下面的保存方法
             settingQuery.setTeacherOpenCourseQuestionSettingId(null);
         }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
index 3f98afc0..13d56f65 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
@@ -206,7 +206,7 @@ public class TeacherOpenCourseQuestionSettingController{
     @Function("teacherOpenCourseQuestionSetting.delete")
     @ResponseBody
     public JsonResult delete(String ids) {
-        teacherOpenCourseQuestionSettingService.deleteTeacherOpenCourseQuestionSetting(ids);
+        teacherOpenCourseQuestionSettingService.logicDeleteTeacherOpenCourseQuestionSetting(ids);
         return JsonResult.success();
     }