From 62a304eb5c68fc7f54a9bc247e76223cc2c7f243 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Dec 2022 11:05:30 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 6fb640a..7a2b309 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
@@ -131,7 +131,12 @@
articleEntity.setArticleUrl(adminAddArticleDto.getArticleUrl());
articleEntity.setType(adminAddArticleDto.getType());
articleEntity.setContentType(adminAddArticleDto.getContentType());
+ articleEntity.setDraftState(adminAddArticleDto.getDraftState());
this.baseMapper.insert(articleEntity);
+
+ if (adminAddArticleDto.getSaveState() == 2) {
+ releaseService.releaseArticle(articleEntity.getId(), articleEntity.getCompanyId());
+ }
return Result.ok("添加成功");
}
@@ -182,7 +187,7 @@
return Result.fail("请选择文章栏目");
}
- if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == null) {
+ if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == -1) {
articleEntity.setBeforeColumnId(articleEntity.getColumnId());
}
articleEntity.setColumnId(columnId);
@@ -207,11 +212,15 @@
articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
articleEntity.setType(adminUpdateArticleDto.getType());
articleEntity.setContentType(adminUpdateArticleDto.getContentType());
- articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
String authorBelong = adminUpdateArticleDto.getAuthorBelong();
articleEntity.setAuthorBelong(authorBelong);
+ articleEntity.setDraftState(adminUpdateArticleDto.getDraftState());
this.baseMapper.updateById(articleEntity);
+
+ if (adminUpdateArticleDto.getSaveState() == 2) {
+ releaseService.releaseArticle(articleEntity.getId(), articleEntity.getCompanyId());
+ }
return Result.ok("更新成功");
}
@@ -224,8 +233,13 @@
Long articleId = Long.valueOf(articleIdStr);
ArticleEntity articleEntity = this.baseMapper.selectById(articleId);
- articleEntity.setDelStatus(ArticleEntity.DELETE_STATUS_YES);
- this.baseMapper.updateById(articleEntity);
+// articleEntity.setDelStatus(ArticleEntity.DELETE_STATUS_YES);
+// this.baseMapper.updateById(articleEntity);
+ if (articleEntity != null) {
+ this.baseMapper.deleteById(articleId);
+
+ releaseService.releaseColumn(articleEntity.getColumnId(), 2, articleEntity.getCompanyId());
+ }
}
}
return Result.ok("删除成功");
@@ -239,6 +253,8 @@
}
articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
this.baseMapper.updateById(articleEntity);
+
+ releaseService.releaseColumn(articleEntity.getColumnId(), 2, articleEntity.getCompanyId());
return Result.ok("操作成功");
}
@@ -291,6 +307,15 @@
articleEntity.setTimeType(timeType);
}
IPage<WebArticleVo> list = this.baseMapper.selectWebArticleInPage(page,articleEntity);
+
+ if (CollUtil.isNotEmpty(list.getRecords())) {
+ for (WebArticleVo record : list.getRecords()) {
+ // 站内
+ if (record.getType() == 1) {
+ record.setArticleUrl(record.getBaseUrl() + record.getPath() + "/" + record.getId() + ".html");
+ }
+ }
+ }
return Result.ok(list);
}
@@ -301,8 +326,8 @@
if(ObjectUtil.isEmpty(articleEntity)){
return Result.fail("文章不存在");
}
+ articleEntity.setDraftState(2);
articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
- articleEntity.setBeforeColumnId(null);
this.baseMapper.updateById(articleEntity);
releaseService.releaseArticle(articleEntity.getId(), companyId);
--
Gitblit v1.9.1