From fc341ea66b1affaadec30cb0e0b690855c30b304 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 01 七月 2025 15:53:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
index e8d5199..f47194c 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
@@ -72,7 +72,7 @@
@Override
public void deleteById(Integer id) {
- carouselMapper.update(new UpdateWrapper<Carousel>().lambda().set(Carousel::getIsdeleted,Constants.ZERO).eq(Carousel::getId,id));
+ carouselMapper.update(new UpdateWrapper<Carousel>().lambda().set(Carousel::getIsdeleted,Constants.ONE).eq(Carousel::getId,id));
}
@Override
@@ -176,7 +176,15 @@
wrapper.lambda().eq(Carousel::getIsdeleted,Constants.ZERO)
.eq(Carousel::getStatus,Constants.ZERO)
.orderByDesc(Carousel::getSortnum);
- return carouselMapper.selectList(wrapper);
+ List<Carousel> carouselList =
+ carouselMapper.selectList(wrapper);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carouselList)){
+ String fileDir = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode();
+ for (Carousel carousel:carouselList) {
+ this.imgFullPath(fileDir,carousel);
+ }
+ }
+ return carouselList;
}
@Override
@@ -188,8 +196,8 @@
.eq(pageWrap.getModel().getId() != null, Carousel::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getRemark() != null, Carousel::getRemark, pageWrap.getModel().getRemark())
.like(pageWrap.getModel().getTitle() != null, Carousel::getTitle, pageWrap.getModel().getTitle())
- .like(pageWrap.getModel().getDetail() != null, Carousel::getDetail, pageWrap.getModel().getDetail())
.eq(pageWrap.getModel().getType() != null, Carousel::getType, pageWrap.getModel().getType())
+ .like(pageWrap.getModel().getDetail() != null, Carousel::getDetail, pageWrap.getModel().getDetail())
.eq(pageWrap.getModel().getJumpType() != null, Carousel::getJumpType, pageWrap.getModel().getJumpType())
.like(pageWrap.getModel().getContent() != null, Carousel::getContent, pageWrap.getModel().getContent())
.eq(pageWrap.getModel().getSortnum() != null, Carousel::getSortnum, pageWrap.getModel().getSortnum())
--
Gitblit v1.9.3