From 20c53190b3bd4b5c01f106af4548ec39e7e88b1f Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 19 Jun 2025 13:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../master/controller/CourseTaihumedController.java    |  8 ++++----
 .../modules/taihumed/controller/CourseController.java  | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/peanut/modules/master/controller/CourseTaihumedController.java b/src/main/java/com/peanut/modules/master/controller/CourseTaihumedController.java
index 3b769384..a2357433 100644
--- a/src/main/java/com/peanut/modules/master/controller/CourseTaihumedController.java
+++ b/src/main/java/com/peanut/modules/master/controller/CourseTaihumedController.java
@@ -93,16 +93,16 @@ public class CourseTaihumedController {
 
     @RequestMapping("/getCourseListForTaihumed")
     public R getCourseListForMedical(@RequestBody Map<String,Object> params){
-        MPJLambdaWrapper<CourseToTaihumed> wrapper = new MPJLambdaWrapper<>();
+        MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
         wrapper.selectAll(CourseEntity.class);
         wrapper.selectAs(CourseToTaihumed::getId,"bindId");
         wrapper.selectAs(CourseToTaihumed::getSort,"toSociologySort");
         wrapper.selectAs(CourseToTaihumed::getLevel,"level");
         wrapper.selectAs(CourseToTaihumed::getSelective,"selective");
-        wrapper.leftJoin(CourseEntity.class,CourseEntity::getId, CourseToTaihumed::getCourseId);
-        wrapper.eq(CourseToTaihumed::getTaihumedId,params.get("taihumedId"));
+        wrapper.rightJoin(CourseToTaihumed.class,CourseToTaihumed::getCourseId,CourseEntity::getId);
+        wrapper.eq(CourseToTaihumed::getTaihumedId,params.get("id"));
         wrapper.orderByAsc(CourseToTaihumed::getSort);
-        List<Object> courseEntities = courseToTaihumedService.listObjs(wrapper);
+        List<CourseEntity> courseEntities = courseService.list(wrapper);
         return R.ok().put("courseList",courseEntities);
     }
 
diff --git a/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java b/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java
index 285146b6..54a64c78 100644
--- a/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java
+++ b/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java
@@ -114,7 +114,8 @@ public class CourseController {
                         .eq(CourseToTalent::getTalentId,taihuTalent.getId()));
                 List<Integer> collect = courseToTalents.stream().map(CourseToTalent::getCourseId).collect(Collectors.toList());
                 List<CourseToTaihumed> cTTs = courseToTaihumedService.list(new LambdaQueryWrapper<CourseToTaihumed>()
-                        .in(CourseToTaihumed::getCourseId,collect));
+                        .in(CourseToTaihumed::getCourseId,collect)
+                        .ne(CourseToTaihumed::getTaihumedId,101));
                 List<Integer> tls = new ArrayList<>();
                 for (CourseToTaihumed ctt:cTTs){
                     topLael(tls,ctt.getTaihumedId());
@@ -126,6 +127,12 @@ public class CourseController {
                         }
                     }
                 }
+                if (!flag){
+                    //会议论坛
+                    if (collect.contains(params.get("courseId"))){
+                        flag = true;
+                    }
+                }
             }
             if (!flag){
                 //不是太湖英才，不是vip，查询买课
@@ -134,6 +141,7 @@ public class CourseController {
                         .eq(UserCourseBuyEntity::getCatalogueId,params.get("catalogueId"))
                         .orderByDesc(UserCourseBuyEntity::getEndTime));
                 if (ucbs.size() > 0){
+                    flag = true;
                     endTime = ucbs.get(0).getEndTime()==null?"":ucbs.get(0).getEndTime().toString();
                 }
             }