From 11e35e0257e48667292b4f563ddf6ce02a3a22bb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 13:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..218c342 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,10 +1114,12 @@
.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())
- .orderByDesc(Labels::getId)
+ .and(StringUtils.isNotBlank(model.getInfo()),i->i.like(Activity::getContent,model.getInfo()).or()
+ .like(Activity::getName,model.getInfo()))
+ .orderByDesc(Activity::getId)
;
queryWrapper.orderByDesc(Activity::getCreateDate);
IPage<Activity> activityIPage = activityJoinMapper.selectJoinPage(page, Activity.class, queryWrapper);
--
Gitblit v1.9.3