From 5da038138e5629359939679936e68a65a077daca Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 九月 2025 09:59:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java
index 2a36d54..3961dbe 100644
--- a/server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java
@@ -53,6 +53,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ information.setType(Constants.formatIntegerNum(information.getType()));
information.setIsdeleted(Constants.ZERO);
information.setCreateDate(new Date());
information.setCreator(user.getId());
@@ -62,7 +63,7 @@
@Override
public void deleteById(Integer id) {
- informationMapper.update(new UpdateWrapper<Information>().lambda().set(Information::getIsdeleted,Constants.ZERO).eq(Information::getId,id));
+ informationMapper.update(new UpdateWrapper<Information>().lambda().set(Information::getIsdeleted,Constants.ONE).eq(Information::getId,id));
}
@Override
@@ -76,7 +77,9 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- informationMapper.deleteBatchIds(ids);
+ for (Integer id : ids) {
+ this.deleteById(id);
+ }
}
@Override
@@ -139,12 +142,16 @@
queryWrapper.lambda()
.eq(Information::getIsdeleted,Constants.ZERO)
.eq(pageWrap.getModel().getId() != null, Information::getId, pageWrap.getModel().getId())
+ .eq(pageWrap.getModel().getModule() != null, Information::getModule, pageWrap.getModel().getModule())
+ .eq(pageWrap.getModel().getType() != null, Information::getType, pageWrap.getModel().getType())
+ .eq(pageWrap.getModel().getStatus() != null, Information::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getRemark() != null, Information::getRemark, pageWrap.getModel().getRemark())
.like(pageWrap.getModel().getTitle() != null, Information::getTitle, pageWrap.getModel().getTitle())
.like(pageWrap.getModel().getDetail() != null, Information::getDetail, pageWrap.getModel().getDetail())
.like(pageWrap.getModel().getContent() != null, Information::getContent, pageWrap.getModel().getContent())
.ge(pageWrap.getModel().getReleaseDate() != null, Information::getReleaseDate, Utils.Date.getStart(pageWrap.getModel().getReleaseDate()))
.le(pageWrap.getModel().getReleaseDate() != null, Information::getReleaseDate, Utils.Date.getEnd(pageWrap.getModel().getReleaseDate()))
+ .orderByDesc(Information::getSortnum)
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -177,8 +184,7 @@
|| Objects.isNull(information.getStatus())
|| Objects.isNull(information.getId())
|| !(Constants.equalsInteger(information.getStatus(),Constants.ZERO)
- || Constants.equalsInteger(information.getStatus(),Constants.ONE))
- ){
+ || Constants.equalsInteger(information.getStatus(),Constants.ONE))){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
informationMapper.update(new UpdateWrapper<Information>().lambda().set(Information::getStatus,information.getStatus()).eq(Information::getId,information.getId()));
--
Gitblit v1.9.3