From b26da15df0f71a11e7d04abd0aa2284d8b8cdef0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 24 七月 2024 17:22:21 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 58450d9..22a4e05 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
@@ -189,6 +189,10 @@
IPage<News> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<News> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ if(Objects.isNull(pageWrap.getModel())){
+ News news = new News();
+ pageWrap.setModel(news);
+ }
pageWrap.getModel().setIsdeleted(Constants.ZERO);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,News::getEditor)
.selectAll(News.class)
@@ -257,7 +261,6 @@
PageData<News> pageData = PageData.from(newsMapper.selectJoinPage(page, News.class,queryWrapper));
if(pageData!=null && pageData.getRecords()!=null && pageData.getRecords().size()>0){
-
List<Long> idList = new ArrayList<>();
for(News model : pageData.getRecords()){
idList.add(model.getId());
@@ -266,7 +269,6 @@
for(News model : pageData.getRecords()){
setFilelistById(model,files);
}
-
}
return pageData;
}
@@ -378,19 +380,19 @@
* @return
*/
@Override
- public DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType){
+ public DailyUpdatesResponse getDailyUpdatesResponse(){
DailyUpdatesResponse dailyUpdatesResponse = new DailyUpdatesResponse();
dailyUpdatesResponse.setDailyUpdateNum(
newsMapper.selectCount(new QueryWrapper<News>().lambda()
.eq(News::getIsdeleted,Constants.ZERO)
.like(News::getCreateDate, DateUtil.getDateLong(new Date()))
- .eq(News::getType,Constants.ONE)
+ .eq(News::getType,Constants.ZERO)
));
dailyUpdatesResponse.setShareNum(
actionsMapper.selectCount(new QueryWrapper<Actions>())
);
dailyUpdatesResponse.setNewsList(
- this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,fileType)
+ this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,Constants.ZERO)
);
return dailyUpdatesResponse;
}
--
Gitblit v1.9.3