Merge branch 'pre'

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamWrongRecordServiceImpl.java

@@ -152,7 +152,8 @@ public class UserExamWrongRecordServiceImpl extends ServiceImpl<UserExamWrongRec
     public Boolean remove_question(UserExamWrongRecordQueryBo bo) {
         return this.remove(new LambdaQueryWrapper<UserExamWrongRecord>()
                 .eq(UserExamWrongRecord::getQuestionId,bo.getQuestionId())
-                .eq(UserExamWrongRecord::getOrderGoodsId,bo.getOrderGoodsId())
+                .eq(Validator.isNotEmpty(bo.getGoodsId()),UserExamWrongRecord::getGoodsId,bo.getGoodsId())
+                .eq(Validator.isNotEmpty(bo.getOrderGoodsId()),UserExamWrongRecord::getOrderGoodsId,bo.getOrderGoodsId())
                 .eq(UserExamWrongRecord::getExamId,bo.getExamId())
                 .eq(UserExamWrongRecord::getUserId,bo.getUserId()));
     }