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<ClassExamDao, ClassExam> 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<ClassExamDao, ClassExam> 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){