diff --git a/src/main/java/com/peanut/modules/common/controller/ClassController.java b/src/main/java/com/peanut/modules/common/controller/ClassController.java
index 5fda8d3a..5b5b1f46 100644
--- a/src/main/java/com/peanut/modules/common/controller/ClassController.java
+++ b/src/main/java/com/peanut/modules/common/controller/ClassController.java
@@ -46,6 +46,8 @@ public class ClassController {
     private SysNoticeService sysNoticeService;
     @Autowired
     private ClassTaskService classTaskService;
+    @Autowired
+    private MyUserService userService;
 
     //班级模型列表
     @RequestMapping("/getClassModelList")
@@ -568,19 +570,15 @@ public class ClassController {
     //生成证书图片
     @RequestMapping("/generateCertificateClass")
     public R generateCertificateClass(@RequestBody Map<String,Object> params) {
-        MyUserEntity user = ShiroUtils.getUser();
+        UserCertificate userCertificate = userCertificateService.getById(params.get("id").toString());
+        MyUserEntity user = userService.getById(userCertificate.getUserId());
         String photoUrl = user.getPhoto();//证书人照片
         String realName = user.getName();//真实姓名
-        UserCertificate userCertificate = userCertificateService.getById(params.get("id").toString());
         String type = userCertificate.getType();//证书类型A a证 B b证 ZK自考
         if ("ZK".equals(type)){
             CourseEntity courseEntity = courseService.getById(userCertificate.getCourseId());
             String courseTitle = userCertificate.getTitle();
-//            ClassExamUser classExamUser = classExamUserService.getOne(new LambdaQueryWrapper<ClassExamUser>()
-//                    .eq(ClassExamUser::getUserId,ShiroUtils.getUId())
-//                    .eq(ClassExamUser::getRelationId,userCertificate.getCourseId()));
-
-            ClassExamUser classExamUser = classExamUserService.getUserHighExam(ShiroUtils.getUId());
+            ClassExamUser classExamUser = classExamUserService.getUserHighExam(user.getId(),courseEntity.getId());
             String endYear = DateUtil.year(classExamUser.getEndTime())+"";
             String endMonth = DateUtil.month(classExamUser.getEndTime())+1+"";
             String endDay = DateUtil.dayOfMonth(classExamUser.getEndTime())+"";
diff --git a/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java b/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java
index 0b3ce65a..2e46b902 100644
--- a/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java
+++ b/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java
@@ -5,5 +5,5 @@ import com.peanut.modules.common.entity.ClassExamUser;
 
 public interface ClassExamUserService extends IService<ClassExamUser> {
 
-    ClassExamUser getUserHighExam(int uid);
+    ClassExamUser getUserHighExam(int uid,int courseId);
 }
diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassExamUserServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassExamUserServiceImpl.java
index 04949618..a061c085 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassExamUserServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassExamUserServiceImpl.java
@@ -14,9 +14,10 @@ import java.util.List;
 @Service("commonClassExamUserService")
 public class ClassExamUserServiceImpl extends ServiceImpl<ClassExamUserDao, ClassExamUser> implements ClassExamUserService {
     @Override
-    public ClassExamUser getUserHighExam(int uid) {
+    public ClassExamUser getUserHighExam(int uid,int courseId) {
         LambdaQueryWrapper<ClassExamUser> classExamUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
         classExamUserLambdaQueryWrapper.eq(ClassExamUser::getUserId,uid);
+        classExamUserLambdaQueryWrapper.eq(ClassExamUser::getRelationId,courseId);
         classExamUserLambdaQueryWrapper.orderByAsc(ClassExamUser::getScore);
         List<ClassExamUser> classExamUsers = this.getBaseMapper().selectList(classExamUserLambdaQueryWrapper);
         return classExamUsers.size()>0?classExamUsers.get(0):null;