From 1e4f8276eb86dde67135126cbb9bae19bb845823 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 12:09:57 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 8e45930..0470ffd 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
@@ -187,7 +187,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
}
if ( StringUtils.isBlank(activity.getName())
- || StringUtils.isBlank(activity.getImgurl())
+// || StringUtils.isBlank(activity.getImgurl())
|| StringUtils.isBlank(activity.getContent())
|| activity.getLabelId()==null
|| activity.getBrandId()==null
@@ -429,6 +429,7 @@
}*/
queryWrapper.eq(Activity::getIsdeleted, Constants.ZERO);
+ queryWrapper.eq(pageWrap.getModel().getStatus() !=null, Activity::getStatus, pageWrap.getModel().getStatus());
queryWrapper.eq(pageWrap.getModel().getLabelId() !=null, Activity::getLabelId, pageWrap.getModel().getLabelId());
queryWrapper.eq(pageWrap.getModel().getBrandId() !=null, Activity::getBrandId, pageWrap.getModel().getBrandId());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Activity::getName, pageWrap.getModel().getName());
@@ -1113,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