From 0d4ff0b2396e202a028a6f952b088d19b5545550 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 17:13:47 +0800
Subject: [PATCH] 代码提交

---
 server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
index 22a4e05..5e8210c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
@@ -200,6 +200,9 @@
         if (pageWrap.getModel().getId() != null) {
             queryWrapper.eq(News::getId, pageWrap.getModel().getId());
         }
+        if(pageWrap.getModel().getIsPublish()!=null && Constants.equalsInteger(pageWrap.getModel().getIsPublish(),Constants.ONE)){
+            queryWrapper.apply(" now() >= t.PUBLISH_DATE ");
+        }
         if (pageWrap.getModel().getCreator() != null) {
             queryWrapper.eq(News::getCreator, pageWrap.getModel().getCreator());
         }
@@ -391,9 +394,22 @@
         dailyUpdatesResponse.setShareNum(
                 actionsMapper.selectCount(new QueryWrapper<Actions>())
         );
-        dailyUpdatesResponse.setNewsList(
-                this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,Constants.ZERO)
+        List<News> list = newsMapper.selectList(new QueryWrapper<News>().lambda()
+                .eq(News::getIsdeleted,Constants.ZERO)
+                .eq(News::getType,Constants.ZERO)
+                .eq(News::getStatus,Constants.ZERO)
+                .eq(News::getFileType,Constants.ZERO)
+                .last( "limit 3"  )
+                .orderByDesc(News::getCreateDate)
         );
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+            List<Long> idList =  list.stream().map(i->i.getId()).collect(Collectors.toList());
+            List<Multifile> files = dealMultifileList(idList);
+            for(News model : list){
+                setFilelistById(model,files);
+            }
+        }
+        dailyUpdatesResponse.setNewsList(list);
         return dailyUpdatesResponse;
     }
 

--
Gitblit v1.9.3