From bf1def1c3d6fda1c247bcbeb7770c1a7133aa27f Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Fri, 12 Apr 2024 11:24:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/peanut/modules/common/entity/CourseEntity.java |  2 ++
 .../master/controller/CourseSociologyController.java   | 10 +++++++---
 .../modules/master/service/impl/CourseServiceImpl.java |  1 +
 .../service/impl/CourseSociologyServiceImpl.java       |  2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
index 63d34b30..e45f20fd 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
@@ -30,4 +30,6 @@ public class CourseEntity {
 
     @TableField(exist = false)
     private List<CourseCatalogueEntity> courseCatalogueEntityList;
+    @TableField(exist = false)
+    private Integer bindId;
 }
diff --git a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java
index e4990d80..c68bf056 100644
--- a/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java
+++ b/src/main/java/com/peanut/modules/master/controller/CourseSociologyController.java
@@ -37,7 +37,7 @@ public class CourseSociologyController {
     @RequestMapping("/addCourseSociology")
     public R addCourseSociology(@RequestBody CourseSociologyEntity courseSociologyEntity){
         courseSociologyService.save(courseSociologyEntity);
-        return R.ok();
+        return R.ok().put("sociology",courseSociologyEntity);
     }
 
     @RequestMapping("/delCourseSociology")
@@ -69,8 +69,12 @@ public class CourseSociologyController {
 
     @RequestMapping("/unbindCourseAndSociology")
     public R unbindCourseAndSociology(@RequestBody CourseToSociologyEntity courseToSociologyEntity){
-        courseToSociologyService.removeById(courseToSociologyEntity.getId());
-        return R.ok();
+        boolean b = courseToSociologyService.removeById(courseToSociologyEntity.getId());
+        if(b){
+            return R.ok();
+        }else {
+            return R.error("error");
+        }
     }
 
 }
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
index cd8f2c0b..a442659b 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
@@ -98,6 +98,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
     public List<CourseEntity> getCourseListForSociology(int sociologyId) {
         MPJLambdaWrapper<CourseToSociologyEntity> wrapper = new MPJLambdaWrapper<>();
         wrapper.selectAll(CourseEntity.class);
+        wrapper.selectAs(CourseToSociologyEntity::getId,"bindId");
         wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId);
         wrapper.eq(CourseToSociologyEntity::getSociologyId,sociologyId);
         List<CourseEntity> courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper);
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java
index 04658262..167f11d4 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java
@@ -60,7 +60,7 @@ public class CourseSociologyServiceImpl extends ServiceImpl<CourseSociologyDao,
             }
         }
         this.updateById(courseSociologyEntity);
-        return R.ok();
+        return R.ok().put("sociology",courseSociologyEntity);
     }
 
     private List<CourseSociologyEntity> sociologys(int id){