From 94e74096d0b45709c66840b825445690369d51ae Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Tue, 11 Mar 2025 18:09:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mcwl-admin):=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mcwl/web/controller/memberCenter/MemberController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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, "未参与活动或已过期");
         }