From edd5bf1c50327c7da1c18f82b46f8cee64d5bab1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 09 Jan 2024 14:37:59 +0800
Subject: [PATCH] 20220812
---
src/main/resources/mapper/ArticleMapper.xml | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index ec40eb7..0def852 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
@@ -48,15 +63,17 @@
<select id="selectPrevOrNextArticle" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
select *
from t_article a, t_column b
- where a.id!=#{id} and (a.column_id=b.id or a.column_id=b.parent_id) and a.column_id=#{columnId} and release_status=1
+ where (a.column_id=b.id or a.column_id=b.parent_id) and a.column_id=#{columnId} and release_status=1
and del_status = 1
<!--上一篇-->
<if test="type == 1">
- order by a.id
+ and #{id} > a.id
+ order by a.release_time
</if>
<!--下一篇-->
<if test="type == 2">
- order by a.id desc
+ and a.id > #{id}
+ order by a.release_time desc
</if>
limit 1
</select>
@@ -77,7 +94,7 @@
inner join t_column b on a.column_id=b.id
inner join t_column c on b.parent_id=c.id or c.id=b.id
<where>
- a.company_id=#{record.companyId} and a.del_status = 1
+ a.company_id=#{record.companyId} and a.del_status = 1 and release_status = 1
<if test="record.columnCode != null and record.columnCode != ''">
and c.column_code=#{record.columnCode}
</if>
@@ -87,8 +104,8 @@
${item}
</foreach>
</if>
- <if test="record.releaseType == 2">
- and release_status = 1
+ <if test="record.isTop != null and record.isTop != ''">
+ and a.is_top=#{record.isTop}
</if>
</where>
order by release_time desc
@@ -97,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
@@ -138,7 +158,7 @@
<select id="selectArticleByColumnId" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
select * from t_article a
- where a.column_id=#{columnId} and a.company_id=#{companyId} and a.del_status = 1
+ where a.column_id=#{columnId} and a.company_id=#{companyId} and a.del_status = 1 and draft_state=2
<if test="type != 4">
<if test="type == 2">
and release_status=1
--
Gitblit v1.9.1