From a88bc9d86256d94dcb4580d43bd88b3f19e98c15 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 16:06:38 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/ArticleMapper.xml | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 305c3df..63fedc5 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -5,10 +5,13 @@
<select id="selectAdminArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.AdminArticleVo">
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
<if test="record != null" >
@@ -45,14 +48,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}
+ 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.id desc
</if>
<!--下一篇-->
<if test="type == 2">
- order by a.id desc
+ and a.id > #{id}
+ order by a.id
</if>
limit 1
</select>
@@ -73,7 +79,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}
+ a.company_id=#{record.companyId} and a.del_status = 1
<if test="record.columnCode != null and record.columnCode != ''">
and c.column_code=#{record.columnCode}
</if>
@@ -83,7 +89,11 @@
${item}
</foreach>
</if>
+ <if test="record.releaseType == 2">
+ and release_status = 1
+ </if>
</where>
+ order by release_time desc
</select>
<select id="selectWebArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.WebArticleVo">
@@ -96,10 +106,8 @@
<where>
and a.del_status = 1
and a.release_status = 1
+ and a.company_id = #{record.companyId}
<if test="record != null" >
- <if test="record.companyId != null">
- and a.company_id = #{record.companyId}
- </if>
<if test="record.columnId != null">
and a.column_id = #{record.columnId}
</if>
@@ -118,8 +126,21 @@
</select>
<select id="selectArticleIdsByColumnId" resultType="java.lang.Long">
+ select a.id from t_article a
+ where a.column_id=#{columnId} and a.company_id=#{companyId} and a.del_status = 1
+ <if test="type != 4">
+ <if test="type == 2">
+ and release_status=1
+ </if>
+ <if test="type == 3">
+ and release_status=0
+ </if>
+ </if>
+ </select>
+
+ <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}
+ where a.column_id=#{columnId} and a.company_id=#{companyId} and a.del_status = 1
<if test="type != 4">
<if test="type == 2">
and release_status=1
--
Gitblit v1.9.1