From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 29928a0..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,6 +131,7 @@
articleEntity.setArticleUrl(adminAddArticleDto.getArticleUrl());
articleEntity.setType(adminAddArticleDto.getType());
articleEntity.setContentType(adminAddArticleDto.getContentType());
+ articleEntity.setDraftState(adminAddArticleDto.getDraftState());
this.baseMapper.insert(articleEntity);
if (adminAddArticleDto.getSaveState() == 2) {
@@ -214,6 +215,7 @@
String authorBelong = adminUpdateArticleDto.getAuthorBelong();
articleEntity.setAuthorBelong(authorBelong);
+ articleEntity.setDraftState(adminUpdateArticleDto.getDraftState());
this.baseMapper.updateById(articleEntity);
if (adminUpdateArticleDto.getSaveState() == 2) {
@@ -235,6 +237,8 @@
// this.baseMapper.updateById(articleEntity);
if (articleEntity != null) {
this.baseMapper.deleteById(articleId);
+
+ releaseService.releaseColumn(articleEntity.getColumnId(), 2, articleEntity.getCompanyId());
}
}
}
@@ -322,6 +326,7 @@
if(ObjectUtil.isEmpty(articleEntity)){
return Result.fail("文章不存在");
}
+ articleEntity.setDraftState(2);
articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
this.baseMapper.updateById(articleEntity);
--
Gitblit v1.9.1