From 3a8d8b6de6daf6e7198a2b8d562dc2fbf49a4a2a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jul 2022 11:47:45 +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/vo/WebArticleVo.java | 6 ++++++
src/main/resources/mapper/ArticleMapper.xml | 5 ++++-
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java | 9 +++++++++
3 files changed, 19 insertions(+), 1 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..13427ba 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
@@ -292,6 +292,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);
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/WebArticleVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/WebArticleVo.java
index e661191..a9614ff 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/WebArticleVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/WebArticleVo.java
@@ -56,4 +56,10 @@
@ApiModelProperty(value = "外部链接地址")
private String articleUrl;
+ @ApiModelProperty(hidden = true)
+ private String baseUrl;
+
+ @ApiModelProperty(hidden = true)
+ private String path;
+
}
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 787b0dd..02ee778 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -99,10 +99,13 @@
<select id="selectWebArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.WebArticleVo">
SELECT
a.*,
- b.column_name columnName
+ b.column_name columnName,
+ c.web_address baseUrl,
+ b.path path
FROM
t_article a
left join t_column b on a.column_id = b.id
+ inner join t_company c on a.company_id=c.id
<where>
and a.del_status = 1
and a.release_status = 1
--
Gitblit v1.9.1