From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/ArticleMapper.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index ec1e9d3..51e2fa9 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -12,8 +12,11 @@
<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}
@@ -22,7 +25,7 @@
and a.title like concat ('%',#{record.title},'%')
</if>
<if test="record.columnIds != null">
- and a.column_id =
+ and a.column_id in
<foreach collection="record.columnIds" separator="," close=")" open="(" item="item">
#{item}
</foreach>
@@ -82,4 +85,46 @@
</if>
</where>
</select>
+
+ <select id="selectWebArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.WebArticleVo">
+ SELECT
+ a.*,
+ b.column_name columnName
+ FROM
+ t_article a
+ left join t_column b on a.column_id = b.id
+ <where>
+ and a.del_status = 1
+ and a.release_status = 1
+ and a.company_id = #{record.companyId}
+ <if test="record != null" >
+ <if test="record.columnId != null">
+ and a.column_id = #{record.columnId}
+ </if>
+ <if test="record.title!=null">
+ and a.title like concat ('%',#{record.title},'%')
+ </if>
+ <if test="record.author!=null">
+ and a.author like concat ('%',#{record.author},'%')
+ </if>
+ <if test="record.timeType!=null">
+ and a.release_time > #{record.timeType}
+ </if>
+ </if>
+ </where>
+ order by a.is_top desc,a.create_time desc
+ </select>
+
+ <select id="selectArticleIdsByColumnId" resultType="java.lang.Long">
+ 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