From 02b6979e6e7680c85ed0911109d182c9a235162f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 16:20:36 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java |    6 ++++--
 1 files changed, 4 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..f6af191 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() == -1) {
             articleEntity.setBeforeColumnId(articleEntity.getColumnId());
         }
         articleEntity.setColumnId(columnId);
@@ -207,7 +207,6 @@
         articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
         articleEntity.setType(adminUpdateArticleDto.getType());
         articleEntity.setContentType(adminUpdateArticleDto.getContentType());
-        articleEntity.setReleaseStatus(0);
 
         String authorBelong = adminUpdateArticleDto.getAuthorBelong();
         articleEntity.setAuthorBelong(authorBelong);
@@ -239,6 +238,8 @@
         }
         articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
         this.baseMapper.updateById(articleEntity);
+
+        releaseService.releaseColumn(articleEntity.getColumnId(), 2, articleEntity.getCompanyId());
         return Result.ok("操作成功");
     }
 
@@ -302,6 +303,7 @@
             return Result.fail("文章不存在");
         }
         articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
+        articleEntity.setBeforeColumnId(null);
         this.baseMapper.updateById(articleEntity);
 
         releaseService.releaseArticle(articleEntity.getId(), companyId);

--
Gitblit v1.9.1