From 4226bfc255dd827f8c90bb7a9cc6aa4649925de9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 14:32:19 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/ArticleMapper.xml | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 6564050..b4f4930 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -5,15 +5,21 @@
<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" >
- <if test="record.columnId != null">
- and a.column_id = #{record.columnId}
+ <if test="record.columnList != null">
+ and a.column_id in
+ <foreach collection="record.columnList" separator="," close=")" open="(" item="item">
+ #{item}
+ </foreach>
</if>
<if test="record.companyId != null">
and a.company_id = #{record.companyId}
@@ -70,7 +76,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>
@@ -81,6 +87,7 @@
</foreach>
</if>
</where>
+ order by release_time desc
</select>
<select id="selectWebArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.WebArticleVo">
@@ -93,10 +100,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>
@@ -113,4 +118,30 @@
</where>
order by a.is_top desc,a.create_time desc
</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}
+ <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}
+ <if test="type != 4">
+ <if test="type == 2">
+ and release_status=1
+ </if>
+ <if test="type == 3">
+ and release_status=0
+ </if>
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1