From b6ae4e06ff57117794d7f876f4641727358570e3 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 12 Jun 2025 09:09:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=95=E5=8D=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/service/impl/ClassExamServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java index 160a43e8..e98deac3 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java @@ -201,7 +201,7 @@ public class ClassExamServiceImpl extends ServiceImpl i .select(ClassExamSubject::getId,ClassExamSubject::getType,ClassExamSubject::getContent) .eq(ClassExamSubject::getCourseId,classCourse.getCourseId()) .eq(ClassExamSubject::getType,0) - .notIn(ClassExamSubject::getId,historySubjectList)); + .notIn(historySubjectList.size()>0,ClassExamSubject::getId,historySubjectList)); Collections.shuffle(singleList);//打乱顺序 try { if (sList.size()+snum>stotal){ @@ -217,7 +217,7 @@ public class ClassExamServiceImpl extends ServiceImpl i .select(ClassExamSubject::getId,ClassExamSubject::getType,ClassExamSubject::getContent) .eq(ClassExamSubject::getCourseId,classCourse.getCourseId()) .eq(ClassExamSubject::getType,1) - .notIn(ClassExamSubject::getId,historySubjectList)); + .notIn(historySubjectList.size()>0,ClassExamSubject::getId,historySubjectList)); Collections.shuffle(mulList);//打乱顺序 try { if (mList.size()+mnum>mtotal){