From 18f2ae152335149ec6673c07cfad8a5c6542d443 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 24 Oct 2025 15:05:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=B4=E9=97=A8=E5=8C=BB=E8=BF=B0=E5=85=8D?= =?UTF-8?q?=E8=B4=B9=E8=AF=BE=E7=A8=8B=E5=B1=95=E7=A4=BA=E6=89=80=E6=9C=89?= =?UTF-8?q?app=E9=87=8C=E7=9A=84=E5=85=8D=E8=B4=B9=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/medical/controller/CourseController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/modules/medical/controller/CourseController.java b/src/main/java/com/peanut/modules/medical/controller/CourseController.java index de9f53c7..57667452 100644 --- a/src/main/java/com/peanut/modules/medical/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/medical/controller/CourseController.java @@ -89,10 +89,15 @@ public class CourseController { public R getFreeCourse(){ MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.distinct(); - wrapper.rightJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId); + wrapper.disableSubLogicDel().leftJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId); + wrapper.disableSubLogicDel().leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId); + wrapper.disableSubLogicDel().leftJoin(CourseToPsyche.class,CourseToPsyche::getCourseId,CourseEntity::getId); wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId); wrapper.eq(CourseCatalogueEntity::getType,0); wrapper.selectAll(CourseEntity.class); + wrapper.and(t->t.eq(CourseToMedicine::getDelFlag,0).or() + .eq(CourseToSociologyEntity::getDelFlag,0).or() + .eq(CourseToPsyche::getDelFlag,0)); wrapper.orderByAsc(CourseEntity::getSort); List courseList = courseService.list(wrapper); return R.ok().put("courseList",courseList);