From 0903e8d64010f6ab7a0e44c6d2d58c5669763d46 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 11:11:08 +0800
Subject: [PATCH] fix 文章更新栏目编码逻辑
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 5 +++--
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 3 +++
2 files changed, 6 insertions(+), 2 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 0c8ca14..945da99 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
@@ -182,7 +182,7 @@
return Result.fail("请选择文章栏目");
}
- if (articleEntity.getColumnId().equals(columnId) && articleEntity.getReleaseStatus() == 1) {
+ if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() != null) {
articleEntity.setBeforeColumnId(articleEntity.getColumnId());
}
articleEntity.setColumnId(columnId);
@@ -207,7 +207,7 @@
articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
articleEntity.setType(adminUpdateArticleDto.getType());
articleEntity.setContentType(adminUpdateArticleDto.getContentType());
- articleEntity.setReleaseStatus(0);
+ articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
String authorBelong = adminUpdateArticleDto.getAuthorBelong();
articleEntity.setAuthorBelong(authorBelong);
@@ -302,6 +302,7 @@
return Result.fail("文章不存在");
}
articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
+ articleEntity.setBeforeColumnId(null);
this.baseMapper.updateById(articleEntity);
releaseService.releaseArticle(articleEntity.getId(), companyId);
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
index 66bf035..a0ac657 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
@@ -46,6 +46,9 @@
ArticleEntity article = articleMapper.selectById(id);
ColumnEntity column = columnMapper.selectById(article.getColumnId());
+ article.setBeforeColumnId(null);
+ articleMapper.updateById(article);
+
Map<String, Object> data = new Hashtable<>();
data.put("id", article.getId());
data.put("companyId", companyId);
--
Gitblit v1.9.1