diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java index d0612c7..819ee0e 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java @@ -170,11 +170,11 @@ public class MemberController { Long userId = SecurityUtils.getUserId(); MemberPromotion memberPromotion = memberPromotionService.lambdaQuery() .eq(MemberPromotion::getUserId, userId) - .eq(MemberPromotion::getPromotionId, promotionId) + .eq(Objects.nonNull(promotionId), MemberPromotion::getPromotionId, promotionId) .eq(MemberPromotion::getStatus, PromotionEnum.PARTICIPATE) .one(); - if (Objects.isNull(memberPromotion)) { + if (Objects.nonNull(promotionId) && Objects.isNull(memberPromotion)) { return R.fail(HttpStatus.SHOW_ERROR_MSG, "未参与活动或已过期"); }