From 03123e40dfda2aca60201e026b40503a5c3ac892 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 11:57:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java |    6 ++++++
 1 files changed, 6 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 8ff8743..a50d269 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
@@ -59,6 +59,10 @@
         if(StrUtil.isNotEmpty(title)){
             articleEntity.setTitle(title);
         }
+        Integer contentType = adminArticleDto.getContentType() == null ? 0 : adminArticleDto.getContentType();
+        if(contentType != 0){
+            articleEntity.setContentType(adminArticleDto.getContentType());
+        }
         if(UserEntity.USER_BELONG_TOP != companyId){
             articleEntity.setCompanyId(companyId);
         }
@@ -108,6 +112,7 @@
 
         articleEntity.setArticleUrl(adminAddArticleDto.getArticleUrl());
         articleEntity.setType(adminAddArticleDto.getType());
+        articleEntity.setContentType(adminAddArticleDto.getContentType());
         this.baseMapper.insert(articleEntity);
         return Result.ok("添加成功");
     }
@@ -179,6 +184,7 @@
 
         articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
         articleEntity.setType(adminUpdateArticleDto.getType());
+        articleEntity.setContentType(adminUpdateArticleDto.getContentType());
         this.baseMapper.updateById(articleEntity);
         return Result.ok("更新成功");
     }

--
Gitblit v1.9.1