From 5e54f37b9bfd01874c22c017c768adb2f8fee24d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jul 2022 11:47:39 +0800
Subject: [PATCH] fix column update

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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..eaca0fb 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.getBeforeColumnId() == null) {
+        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(ArticleEntity.RELEASE_STATUS_NO);
 
         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,7 +303,6 @@
             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