From 93e281b3cc60c8d24a0ed5547d3d399c03f9bab6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Jun 2022 18:03:52 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
index 4bf31f5..d910537 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
@@ -43,7 +43,7 @@
@Override
public Result getArticleInPage(AdminArticleDto adminArticleDto) {
UserEntity userlogin = LoginUserUtil.getLoginUser();
- long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
+ long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
Page<AdminArticleVo> page = new Page<>(adminArticleDto.getPageNum(), adminArticleDto.getPageSize());
ArticleEntity articleEntity = new ArticleEntity();
Long columnId = adminArticleDto.getColumnId() == null ? 0L : adminArticleDto.getColumnId();
@@ -54,7 +54,9 @@
if(StrUtil.isNotEmpty(title)){
articleEntity.setTitle(title);
}
- articleEntity.setBelongId(belongId);
+ if(UserEntity.USER_BELONG_TOP != belongId){
+ articleEntity.setBelongId(belongId);
+ }
IPage<AdminArticleVo> list = this.baseMapper.selectAdminArticleInPage(page,articleEntity);
return Result.ok(list);
}
@@ -63,7 +65,7 @@
@Transactional
public Result addArticle(AdminAddArticleDto adminAddArticleDto) {
UserEntity userlogin = LoginUserUtil.getLoginUser();
- long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId();
+ long belongId = userlogin.getBelongId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getBelongId();
ArticleEntity articleEntity = new ArticleEntity();
articleEntity.setBelongId(belongId);
String title = adminAddArticleDto.getTitle();
@@ -78,6 +80,10 @@
String author = adminAddArticleDto.getAuthor();
if(StrUtil.isNotEmpty(author)){
articleEntity.setAuthor(author);
+ }
+ String authorBelong = adminAddArticleDto.getAuthorBelong();
+ if(StrUtil.isNotEmpty(authorBelong)){
+ articleEntity.setAuthorBelong(authorBelong);
}
String remark = adminAddArticleDto.getRemark();
if(StrUtil.isNotEmpty(remark)){
@@ -154,18 +160,12 @@
}
articleEntity.setTitle(title);
String childTitle = adminUpdateArticleDto.getChildTitle();
- if(StrUtil.isNotEmpty(childTitle)){
- articleEntity.setChildTitle(childTitle);
- }
+ articleEntity.setChildTitle(childTitle);
String author = adminUpdateArticleDto.getAuthor();
- if(StrUtil.isNotEmpty(author)){
- articleEntity.setAuthor(author);
- }
+ articleEntity.setAuthor(author);
String remark = adminUpdateArticleDto.getRemark();
- if(StrUtil.isNotEmpty(remark)){
- articleEntity.setRemark(remark);
- }
+ articleEntity.setRemark(remark);
long columnId = adminUpdateArticleDto.getColumnId() == null ? 0L : adminUpdateArticleDto.getColumnId();
if(columnId == 0L){
return Result.fail("请选择文章栏目");
@@ -178,9 +178,7 @@
Integer visits = adminUpdateArticleDto.getVisits() == null ? 0 : adminUpdateArticleDto.getVisits();
articleEntity.setVisits(visits);
String mainDiagram = adminUpdateArticleDto.getMainDiagram();
- if(StrUtil.isNotEmpty(mainDiagram)){
- articleEntity.setMainDiagram(mainDiagram);
- }
+ articleEntity.setMainDiagram(mainDiagram);
String atlas = adminUpdateArticleDto.getAtlas();
articleEntity.setAtlas(atlas);
Date releaseTime = adminUpdateArticleDto.getReleaseTime();
--
Gitblit v1.9.1