From f91ab0d52757f298a274b9e4eac590d62a9baad5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 23 六月 2025 14:42:59 +0800
Subject: [PATCH] 111

---
 server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java    |    4 ++--
 server/src/main/java/com/doumee/service/business/impl/InformationServiceImpl.java |    4 +++-
 2 files changed, 5 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 fa35f50..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
@@ -196,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())
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..a2cf2e2 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
@@ -62,7 +62,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
@@ -139,12 +139,14 @@
         queryWrapper.lambda()
                 .eq(Information::getIsdeleted,Constants.ZERO)
                 .eq(pageWrap.getModel().getId() != null, Information::getId, pageWrap.getModel().getId())
+                .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)) {

--
Gitblit v1.9.3