From b7ac6327bc9433c5d3cf26439296d535037c610c Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 18 Apr 2025 10:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B=E3=80=81?= =?UTF-8?q?=E5=A4=8D=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/controller/CourseRelearnController.java | 1 + .../modules/sociology/service/impl/CourseServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java b/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java index eab0b276..a68c20b3 100644 --- a/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java +++ b/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java @@ -102,6 +102,7 @@ public class CourseRelearnController { //课程目录复读列表 @RequestMapping("/relearnShopProductList") public R relearnShopProductList(@RequestBody Map params) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.leftJoin(ShopProductCourseEntity.class,ShopProductCourseEntity::getProductId,ShopProduct::getProductId); wrapper.selectAll(ShopProduct.class); diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index 415075a2..0a90eda3 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -354,6 +354,7 @@ public class CourseServiceImpl extends ServiceImpl impl wrapper.selectAll(CourseEntity.class); wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId"); wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle"); + wrapper.selectAs(CourseCatalogueEntity::getType,"catalogueType"); wrapper.orderByAsc(CourseEntity::getSort); wrapper.orderByAsc(CourseCatalogueEntity::getSort); List> courseList = this.getBaseMapper().selectMaps(wrapper); @@ -382,6 +383,7 @@ public class CourseServiceImpl extends ServiceImpl impl courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper); }else { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.distinct(); wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getId,UserCourseBuyEntity::getCatalogueId); wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseCatalogueEntity::getCourseId); wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,UserCourseBuyEntity::getCourseId);