From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
index bda96d7..fd94cfb 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
@@ -1114,6 +1114,7 @@
.selectAs(Labels::getParam,Activity::getParam)
.leftJoin(Labels.class,Labels::getId,Activity::getLabelId)
.eq(Activity::getIsdeleted,Constants.ZERO)
+ .eq(Activity::getStatus,Constants.ZERO)
.eq(Objects.nonNull(model.getLabelId()),Activity::getLabelId,model.getLabelId())
.eq(Objects.nonNull(model.getBrandId()),Activity::getBrandId,model.getBrandId())
.like(StringUtils.isNotBlank(model.getInfo()),Activity::getContent,model.getInfo())
--
Gitblit v1.9.3