From 9ef3d48a2878cd76890fc1e1d78734e27afb8ac3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 04 Jul 2022 15:23:44 +0800
Subject: [PATCH] fix article
---
src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java | 4 ++++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java | 6 ++++++
src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java | 6 ++++++
src/main/resources/mapper/CmsTemplateMapper.xml | 5 ++++-
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 6 ++++++
5 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
index 7f2491f..fcfa446 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminAddArticleDto.java
@@ -59,4 +59,10 @@
@ApiModelProperty(value = "上传附件")
private String uploadFile;
+
+ @ApiModelProperty(value = "1-站内 2-外部链接")
+ private Integer type;
+
+ @ApiModelProperty(value = "外部链接地址")
+ private String articleUrl;
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
index 8eb8f2d..e7daf51 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateArticleDto.java
@@ -61,4 +61,10 @@
@ApiModelProperty(value = "上传附件")
private String uploadFile;
+
+ @ApiModelProperty(value = "1-站内 2-外部链接")
+ private Integer type;
+
+ @ApiModelProperty(value = "外部链接地址")
+ private String articleUrl;
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
index 6cf38dc..ab5e558 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
@@ -76,4 +76,8 @@
//所属ID
private Long companyId;
+ private Integer type;
+
+ private String articleUrl;
+
}
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 601c2bc..ef72a33 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
@@ -105,6 +105,9 @@
articleEntity.setArticleDetails(articleDetails);
String uploadFile = adminAddArticleDto.getUploadFile();
articleEntity.setUploadFile(uploadFile);
+
+ articleEntity.setArticleUrl(adminAddArticleDto.getArticleUrl());
+ articleEntity.setType(adminAddArticleDto.getType());
this.baseMapper.insert(articleEntity);
return Result.ok("添加成功");
}
@@ -173,6 +176,9 @@
articleEntity.setArticleDetails(articleDetails);
String uploadFile = adminUpdateArticleDto.getUploadFile();
articleEntity.setUploadFile(uploadFile);
+
+ articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
+ articleEntity.setType(adminUpdateArticleDto.getType());
this.baseMapper.updateById(articleEntity);
return Result.ok("更新成功");
}
diff --git a/src/main/resources/mapper/CmsTemplateMapper.xml b/src/main/resources/mapper/CmsTemplateMapper.xml
index 217f175..23e70df 100644
--- a/src/main/resources/mapper/CmsTemplateMapper.xml
+++ b/src/main/resources/mapper/CmsTemplateMapper.xml
@@ -14,6 +14,9 @@
<delete id="delete">
delete from cms_template
- where id=#{id} and company_id=#{companyId}
+ where id=#{id}
+ <if test="companyId != null and companyId != 0">
+ and company_id=#{companyId}
+ </if>
</delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1