diff --git a/src/main/java/xyz/playedu/api/controller/ExceptionController.java b/src/main/java/xyz/playedu/api/controller/ExceptionController.java index 5bc268b..6358dd2 100644 --- a/src/main/java/xyz/playedu/api/controller/ExceptionController.java +++ b/src/main/java/xyz/playedu/api/controller/ExceptionController.java @@ -37,11 +37,11 @@ import java.util.List; @Slf4j public class ExceptionController { - @ExceptionHandler(Exception.class) - public JsonResponse exceptionHandler(Exception e) { - log.error(e.getMessage()); - return JsonResponse.error("系统错误", 500); - } + // @ExceptionHandler(Exception.class) + // public JsonResponse exceptionHandler(Exception e) { + // log.error(e.getMessage()); + // return JsonResponse.error("系统错误", 500); + // } @ExceptionHandler(ServiceException.class) public JsonResponse serviceExceptionHandler(ServiceException e) { diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java index c784c3c..23b2513 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java @@ -237,11 +237,10 @@ public class CourseServiceImpl extends ServiceImpl impleme if (tmpCourseIds == null || tmpCourseIds.size() == 0) { return new ArrayList<>(); } - // 取交集 - courseIds.retainAll(tmpCourseIds); - } - if (courseIds.size() == 0) { - return new ArrayList<>(); + courseIds = courseIds.stream().filter(tmpCourseIds::contains).toList(); + if (courseIds.size() == 0) { + return new ArrayList<>(); + } } return list(query().getWrapper().in("id", courseIds).eq("is_show", 1)); } diff --git a/src/main/resources/mapper/CourseMapper.xml b/src/main/resources/mapper/CourseMapper.xml index f03a8b1..45b095d 100644 --- a/src/main/resources/mapper/CourseMapper.xml +++ b/src/main/resources/mapper/CourseMapper.xml @@ -172,10 +172,13 @@ SELECT `courses`.* FROM `courses` LEFT JOIN `course_department` ON `course_department`.`course_id` = `courses`.`id` + + INNER JOIN `resource_course_category` ON `resource_course_category`.`course_id` = `courses`.`id` + WHERE `course_department`.`course_id` IS NULL AND `courses`.`is_show` = 1 - AND `course_department`.`caetgory_id` = #{categoryId} + AND `resource_course_category`.`category_id` = #{categoryId} LIMIT #{limit}