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 5e6db3b3..2c755c36 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
@@ -52,6 +52,8 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
     private CourseCatalogueChapterDao courseCatalogueChapterDao;
     @Autowired
     private RabbitTemplate rabbitTemplate;
+    @Autowired
+    private UserCertificateDao userCertificateDao;
 
     @Override
     public Page getClassModelList(Map<String, Object> params) {
@@ -650,9 +652,17 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
         wrapper.selectAll(ClassCourse.class);
         wrapper.eq(ClassEntity::getId,classEntity.getId());
         List<ClassCourse> courseList = classCourseDao.selectList(wrapper);
-        //关联课程是否有已进班的
         if (courseList.size() > 0){
             for (ClassCourse classCourse:courseList){
+                //是否有拿过该课程证书
+                int count = userCertificateDao.selectCount(new LambdaQueryWrapper<UserCertificate>()
+                        .and(t->t.eq(UserCertificate::getType,"A").or().eq(UserCertificate::getType,"B"))
+                        .eq(UserCertificate::getCourseId,classCourse.getCourseId())
+                        .eq(UserCertificate::getUserId,ShiroUtils.getUId()));
+                if (count>0){
+                    return R.error("已获得相关课程证书");
+                }
+                //关联课程是否有已进班的
                 MPJLambdaWrapper<ClassCourse> courseWrapper = new MPJLambdaWrapper();
                 courseWrapper.leftJoin(ClassModel.class,ClassModel::getId,ClassCourse::getModelId);
                 courseWrapper.leftJoin(ClassEntity.class,ClassEntity::getModelId,ClassModel::getId);
@@ -799,9 +809,14 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             int noScore = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
                     .eq(ClassTaskAndQuesReply::getRelationId,classTask.getId())
                     .lt(ClassTaskAndQuesReply::getScoreSuccess,2));
+            int userNoCount = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper<ClassTaskAndQuesReply>()
+                    .eq(ClassTaskAndQuesReply::getRelationId,classTask.getId())
+                    .lt(ClassTaskAndQuesReply::getScoreSuccess,2)
+                    .notLike(ClassTaskAndQuesReply::getScoreInfo,"\""+ShiroUtils.getUId()+"\""));
             Map<String,Object> result = new HashMap<>();
             result.put("setGiveHomeWorkNumber",alreadyReply);
             result.put("setNoGiveScoreNumber",noScore);
+            result.put("userNoCount",userNoCount);
             classTask.setOtherInfo(result);
         }
         return classTaskPage;