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 |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 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 eaca0fb..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("添加成功");
     }
 
@@ -210,7 +215,12 @@
 
         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("更新成功");
     }
 
@@ -223,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("删除成功");
@@ -292,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);
     }
 
@@ -302,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