From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
index f122600..de162d3 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -2,6 +2,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -12,11 +13,14 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 骞垮憡淇℃伅琛⊿ervice瀹炵幇
@@ -34,6 +38,11 @@
@Override
public String create(Ad ad) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ ad.setIsdeleted(Constants.ZERO);
+ ad.setStatus(Constants.ZERO);
+ ad.setCreateDate(new Date());
+ ad.setCreator(loginUserInfo.getId());
adMapper.insert(ad);
return ad.getId();
}
@@ -59,16 +68,18 @@
@Override
public void updateById(Ad ad) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
UpdateWrapper<Ad> wrapper = new UpdateWrapper<>();
wrapper.lambda()
.eq(Ad::getId,ad.getId())
- .set(Ad::getEditor,ad.getEditor())
+ .set(Ad::getEditor,loginUserInfo.getId())
.set(Ad::getEditDate,ad.getEditDate())
- .set(Ad::getName,ad.getName())
- .set(Ad::getImgurl,ad.getImgurl())
+ .set(Objects.nonNull(ad.getName()),Ad::getName,ad.getName())
+ .set(Objects.nonNull(ad.getImgurl()),Ad::getImgurl,ad.getImgurl())
.set(Ad::getSortnum,ad.getSortnum())
- .set(Ad::getContent,ad.getContent())
- .set(Ad::getStatus,ad.getStatus());
+ .set(Objects.nonNull(ad.getContent()),Ad::getContent,ad.getContent())
+ .set(Objects.nonNull(ad.getStatus()),Ad::getStatus,ad.getStatus());
adMapper.update(null,wrapper);
}
@@ -129,7 +140,7 @@
queryWrapper.lambda().eq(Ad::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Ad::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Ad::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getSortnum() != null) {
queryWrapper.lambda().eq(Ad::getSortnum, pageWrap.getModel().getSortnum());
--
Gitblit v1.9.3