From 28d8018e22dbc0f798a37befdea6fa6a8092f939 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 26 May 2025 09:37:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E7=AD=BE=E6=97=B6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=AF=BE=E7=A8=8B=E6=98=AF=E5=90=A6=E5=AD=98?= =?UTF-8?q?=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoursePsycheServiceImpl.java | 16 +++++++++++++--- .../service/impl/CourseMedicineServiceImpl.java | 16 +++++++++++++--- .../service/impl/CourseSociologyServiceImpl.java | 16 +++++++++++++--- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/service/impl/CoursePsycheServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/CoursePsycheServiceImpl.java index 72c2e5e7..7e01d392 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/CoursePsycheServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/CoursePsycheServiceImpl.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.common.utils.R; +import com.peanut.modules.common.dao.CourseDao; import com.peanut.modules.common.dao.CoursePsycheDao; import com.peanut.modules.common.dao.CourseToPsycheDao; +import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CoursePsyche; import com.peanut.modules.common.entity.CourseToPsyche; import com.peanut.modules.common.service.CoursePsycheService; @@ -23,6 +25,8 @@ public class CoursePsycheServiceImpl extends ServiceImpl getCoursePsycheTree() { @@ -87,9 +91,15 @@ public class CoursePsycheServiceImpl extends ServiceImpl().eq(CourseToPsyche::getPsycheId, id)); - if(integer>0){ - return R.error(502,"删除失败，请先解绑课程与心灵空间标签的绑定关系"); + List toPsyches = courseToPsycheDao.selectList(new LambdaQueryWrapper() + .eq(CourseToPsyche::getPsycheId, id)); + for (CourseToPsyche toPsyche:toPsyches){ + CourseEntity c = courseDao.selectById(toPsyche.getCourseId()); + if (c!=null){ + return R.error(502,"删除失败，请先解绑课程与心灵空间标签的绑定关系"); + }else { + courseToPsycheDao.deleteById(toPsyche.getId()); + } } this.removeById(id); return R.ok(); diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java index 5f3903a3..7fcced9e 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java @@ -3,8 +3,10 @@ package com.peanut.modules.master.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.common.utils.R; +import com.peanut.modules.common.dao.CourseDao; import com.peanut.modules.common.dao.CourseMedicineDao; import com.peanut.modules.common.dao.CourseToMedicineDao; +import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseMedicine; import com.peanut.modules.common.entity.CourseToMedicine; import com.peanut.modules.master.service.CourseMedicalService; @@ -20,6 +22,8 @@ public class CourseMedicineServiceImpl extends ServiceImpl getCourseMedicalList() { @@ -34,9 +38,15 @@ public class CourseMedicineServiceImpl extends ServiceImpl().eq(CourseToMedicine::getMedicalId, id)); - if(integer>0){ - return R.error(502,"删除失败，请先解绑课程与医学标签的绑定关系"); + List toMedicines = toMedicalDao.selectList(new LambdaQueryWrapper() + .eq(CourseToMedicine::getMedicalId, id)); + for (CourseToMedicine toMedicine:toMedicines){ + CourseEntity c = courseDao.selectById(toMedicine.getCourseId()); + if (c!=null){ + return R.error(502,"删除失败，请先解绑课程与医学标签的绑定关系"); + }else { + toMedicalDao.deleteById(toMedicine.getId()); + } } this.removeById(id); return R.ok(); 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 2b2f02be..2d4f0554 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 @@ -3,8 +3,10 @@ package com.peanut.modules.master.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.common.utils.R; +import com.peanut.modules.common.dao.CourseDao; import com.peanut.modules.common.dao.CourseSociologyDao; import com.peanut.modules.common.dao.CourseToSociologyDao; +import com.peanut.modules.common.entity.CourseEntity; import com.peanut.modules.common.entity.CourseSociologyEntity; import com.peanut.modules.common.entity.CourseToSociologyEntity; import com.peanut.modules.master.service.CourseSociologyService; @@ -20,6 +22,8 @@ public class CourseSociologyServiceImpl extends ServiceImpl getCourseSociologyList() { @@ -34,9 +38,15 @@ public class CourseSociologyServiceImpl extends ServiceImpl().eq(CourseToSociologyEntity::getSociologyId, id)); - if(integer>0){ - return R.error(502,"删除失败，请先解绑课程与国学标签的绑定关系"); + List toSociologys = courseToSociologyDao.selectList(new LambdaQueryWrapper() + .eq(CourseToSociologyEntity::getSociologyId, id)); + for (CourseToSociologyEntity toSociologyEntity:toSociologys){ + CourseEntity c = courseDao.selectById(toSociologyEntity.getCourseId()); + if (c!=null){ + return R.error(502,"删除失败，请先解绑课程与国学标签的绑定关系"); + }else { + courseToSociologyDao.deleteById(toSociologyEntity.getId()); + } } this.removeById(id); return R.ok();