From 0cd3a666af34e28eaf50ed1392b5d219a9d2b1cf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 24 七月 2024 09:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 6 ++++--
1 files changed, 4 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 58450d9..48e7f1e 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;
}
--
Gitblit v1.9.3