From 3d7afb3f26718b7c9a19f6926054a514ea6a4500 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 17:42:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/ArticleMapper.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 43ec8e5..6564050 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -22,7 +22,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>
@@ -55,8 +55,62 @@
</select>
<select id="selectArticleById" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
- select a.*, b.column_code, b.column_name
+ select a.*, b.column_code, b.column_name, b.path
from t_article a, t_column b
where a.column_id=b.id and a.id=#{id}
</select>
+
+ <select id="selectArticleInPage" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
+ select
+ a.*,
+ b.column_code,
+ b.column_name,
+ b.path
+ from t_article a
+ 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}
+ <if test="record.columnCode != null and record.columnCode != ''">
+ and c.column_code=#{record.columnCode}
+ </if>
+ <if test="record.columnIds != null">
+ and c.id in
+ <foreach collection="record.columnIds" item="item" open="(" close=")" separator=",">
+ ${item}
+ </foreach>
+ </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
+ <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>
+ <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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1