From 06997534a3e7d71e88f770e8c1acd15605beef51 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 11 Jul 2022 15:52:36 +0800 Subject: [PATCH] fix --- src/main/resources/mapper/ArticleMapper.xml | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index ea6ebfa..ec40eb7 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -6,7 +6,8 @@ SELECT a.*, b.column_name columnName, - c.web_address baseUrl + c.web_address baseUrl, + b.path path FROM t_article a left join t_column b on a.column_id = b.id @@ -47,7 +48,8 @@ <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.id!=#{id} and (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 @@ -85,7 +87,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"> @@ -118,8 +124,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