From eda6a92539db505eadc67687e68bbda9f608dceb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jul 2022 16:01:51 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/ArticleMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 63fedc5..02ee778 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -79,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} 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>
@@ -89,8 +89,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
@@ -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