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);