From fecc2f4fd83d00a7baa8c12083a11cc4afe054e9 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 28 Oct 2025 17:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95ios=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E7=9C=8B=E5=BE=97=E8=A7=86=E9=A2=91;=E5=85=8D=E8=B4=B9?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8C=89=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medical/controller/CourseController.java  | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

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 57667452..6593316f 100644
--- a/src/main/java/com/peanut/modules/medical/controller/CourseController.java
+++ b/src/main/java/com/peanut/modules/medical/controller/CourseController.java
@@ -5,6 +5,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
 import com.peanut.common.utils.ShiroUtils;
 import com.peanut.modules.common.entity.*;
+import com.peanut.modules.common.service.CourseErrorLogService;
 import com.peanut.modules.common.to.ParamTo;
 import com.peanut.modules.medical.service.CourseMedicalService;
 import com.peanut.modules.medical.service.CourseService;
@@ -26,6 +27,8 @@ public class CourseController {
     private CourseService courseService;
     @Autowired
     private CourseMedicalService courseMedicalService;
+    @Autowired
+    private CourseErrorLogService courseErrorLogService;
 
     //添加正在学习（收藏）
     @RequestMapping("/addUserCourseStudying")
@@ -84,20 +87,35 @@ public class CourseController {
         return R.ok().put("data",courseList);
     }
 
+    //记录ios不能看得视频
+    @RequestMapping("/addErrorCourse")
+    public R addErrorCourse(@RequestBody CourseErrorLog courseErrorLog){
+        courseErrorLogService.save(courseErrorLog);
+        return R.ok();
+    }
+
     //免费课程
     @RequestMapping("/getFreeCourse")
-    public R getFreeCourse(){
+    public R getFreeCourse(@RequestBody Map<String,Object> params){
         MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
         wrapper.distinct();
-        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);
+        if ("medicine".equals(params.get("type"))) {
+            wrapper.leftJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
+        }else if ("sociology".equals(params.get("type"))) {
+            wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
+        }else if ("psyche".equals(params.get("type"))) {
+            wrapper.leftJoin(CourseToPsyche.class,CourseToPsyche::getCourseId,CourseEntity::getId);
+        }else {
+            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.and(t->t.eq(CourseToMedicine::getDelFlag,0).or()
+                    .eq(CourseToSociologyEntity::getDelFlag,0).or()
+                    .eq(CourseToPsyche::getDelFlag,0));
+        }
         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<CourseEntity> courseList = courseService.list(wrapper);
         return R.ok().put("courseList",courseList);