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 93743062..87d60f9d 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
@@ -242,10 +242,14 @@ public class ClassExamServiceImpl extends ServiceImpl<ClassExamDao, ClassExam> i
     public R examingPaper() {
         ClassExamUser classExamUser = classExamUserDao.selectOne(new LambdaQueryWrapper<ClassExamUser>()
                 .eq(ClassExamUser::getUserId,ShiroUtils.getUId()).eq(ClassExamUser::getScoreSuccess,0));
-        ClassEntity classEntity = classEntityDao.selectById(classExamUser.getClassId());
-        ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
-        return R.ok().put("classExamUser",classExamUser)
-                .put("planEndTime",DateUtils.addDateMinutes(classExamUser.getStartTime(),classModel.getExamTime()));
+        if (classExamUser!=null){
+            ClassEntity classEntity = classEntityDao.selectById(classExamUser.getClassId());
+            ClassModel classModel = classModelDao.selectById(classEntity.getModelId());
+            return R.ok().put("classExamUser",classExamUser)
+                    .put("planEndTime",DateUtils.addDateMinutes(classExamUser.getStartTime(),classModel.getExamTime()));
+        }else {
+            return R.ok().put("classExamUser",null).put("planEndTime",null);
+        }
     }
 
     @Override
diff --git a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java
index 0c19b16c..b3d1ebe4 100644
--- a/src/main/java/com/peanut/modules/master/controller/ShopProductController.java
+++ b/src/main/java/com/peanut/modules/master/controller/ShopProductController.java
@@ -32,8 +32,6 @@ public class ShopProductController {
 
     @Autowired
     private ShopProductService shopProductService;
-    @Autowired
-    private ShopProductBookService shopProductBookService;
 
     /**
      * 列表
@@ -61,27 +59,7 @@ public class ShopProductController {
     @RequestMapping("/addProduct")
     public R addProduct(@RequestBody ShopProduct shopProduct){
         shopProduct.setCreateTime(new Date());
-        String bkids = "";
-        for (String s : shopProduct.getBookids()) {
-            bkids += s + ",";
-        }
-        if (bkids != null && !bkids.isEmpty()) {
-            String substring = bkids.substring(0, bkids.length() - 1);
-            shopProduct.setBookId(substring);
-        } else {
-            shopProduct.setBookId("");
-        }
         shopProductService.save(shopProduct);
-        ShopProductBookEntity shopProductBookEntity = new ShopProductBookEntity();
-        for (String s : shopProduct.getBookids()) {
-            String bookIdList = s;
-            if (bookIdList != null) {
-                Integer product = shopProduct.getProductId();
-                shopProductBookEntity.setProductId(product);
-                shopProductBookEntity.setBookId(Integer.valueOf(bookIdList));
-                shopProductBookService.save(shopProductBookEntity);
-            }
-        }
         return R.ok();
     }