From 5bc1200388543d7e5cf7aae5062eba08dda9192e Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 21 Apr 2025 11:35:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=82=B9=E5=87=BB=E7=AB=A0?=
 =?UTF-8?q?=E8=8A=82=E6=97=B6=E6=88=91=E7=9A=84=E8=A7=81=E8=A7=A3undefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/ClassEntityServiceImpl.java      | 9 +++++++--
 .../service/impl/CourseCatalogueChapterServiceImpl.java  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
index b90f8c02..02c923bc 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
@@ -680,8 +680,13 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
         wrapper.eq(ClassCourse::getCourseId,params.get("courseId"));
         wrapper.eq(ClassUser::getUserId,ShiroUtils.getUId());
         wrapper.eq(ClassUser::getRole,"0");
-        wrapper.ne(ClassEntity::getState,"2");
-        return this.baseMapper.selectOne(wrapper);
+        wrapper.orderByAsc(ClassEntity::getState);
+//        wrapper.ne(ClassEntity::getState,"2");
+        List<ClassEntity> classes = this.baseMapper.selectList(wrapper);
+        if (classes != null&&classes.size() > 0) {
+            return classes.get(0);
+        }
+        return null;
     }
 
     public List<ClassEntity> getClassByCourseId(Map<String, Object> params) {
diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java
index 46da6ca8..94f9ac9b 100644
--- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java
+++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java
@@ -73,7 +73,7 @@ public class CourseCatalogueChapterServiceImpl extends ServiceImpl<CourseCatalog
         flag.put("current",getCurrentVideo(chapterId));
 
         List<UserCourseBuyEntity> userCourseBuyEntities = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()).eq(UserCourseBuyEntity::getCatalogueId, byId.getCatalogueId()));
-        if (userCourseBuyEntities.size()==1){
+        if (userCourseBuyEntities.size()>0){
             flag.put("buy",userCourseBuyEntities.get(0));
         }