From b74faa19bd619213d4de8772b1816c2f87c29449 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Aug 2022 15:44:50 +0800
Subject: [PATCH] Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve
---
src/main/resources/mapper/ArticleMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 787b0dd..eedc185 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -4,7 +4,22 @@
<select id="selectAdminArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.AdminArticleVo">
SELECT
- a.*,
+ a.id,
+ a.title,
+ a.child_title childTitle,
+ a.author,
+ a.author_belong authorBelong,
+ a.remark,
+ a.column_id columnId,
+ a.visits,
+ a.main_diagram mainDiagram,
+ a.atlas,
+ a.release_time releaseTime,
+ a.is_top isTop,
+ a.release_status releaseStatus,
+ a.del_status delStatus,
+ a.type,
+ a.article_url articleUrl,
b.column_name columnName,
c.web_address baseUrl,
b.path path
@@ -99,10 +114,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