From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index b1ac77a..f7c1104 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -51,6 +51,32 @@
and jn.id = #{id}
</select>
+
+ <sql id="selectArticle">
+ select
+ id,
+ title,
+ type,
+ content,
+ url,
+ video_url,
+ source_id,
+ source_name,
+ article_type,
+ recommend,
+ publish,
+ iscomment,
+ view_number,
+ create_time,
+ update_time,
+ update_user,
+ create_user,
+ is_deleted
+ from
+ jczz_article
+ </sql>
+
+
<select id="selectArticlePageByApp" resultMap="noticeResultMap">
select ja.id,
ja.title,
@@ -69,13 +95,20 @@
ja.update_user,
ja.create_user,
ja.is_deleted,
- bdb.dict_value dictValue
+ bdb.dict_value dictValue,
+ jpd.id pdId,
+ jpd.event_type
from jczz_article ja LEFT JOIN blade_dict_biz bdb on ja.article_type = bdb.dict_key
+ LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
where ja.is_deleted = 0
and ja.publish = 1
and bdb.parent_id = '1722966265111248897'
<if test="article.articleType != null and article.articleType != ''">
and ja.article_type = #{article.articleType}
+ </if>
+
+ <if test="article.eventType != null">
+ and jpd.event_type = #{article.eventType}
</if>
order by ja.create_time desc
</select>
@@ -340,4 +373,52 @@
and iswords = "0" and type!=1
order by id desc
</select>
+
+
+ <select id="getArticleOne" parameterType="org.springblade.modules.article.vo.ArticleVO" resultMap="noticeResultMap">
+ select ja.id,
+ ja.title,
+ ja.type,
+ ja.url,
+ ja.video_url,
+ ja.source_id,
+ ja.content,
+ ja.source_name,
+ ja.article_type,
+ ja.recommend,
+ ja.publish,
+ ja.iscomment,
+ ja.view_number,
+ ja.create_time,
+ ja.update_time,
+ ja.update_user,
+ ja.create_user,
+ ja.is_deleted,
+ bdb.dict_value dictValue
+ from jczz_article ja LEFT JOIN blade_dict_biz bdb on ja.article_type = bdb.dict_key
+ <where>
+ <if test="id != null "> and ja.id = #{id}</if>
+ <if test="title != null and title != ''"> and ja.title = #{title}</if>
+ <if test="type != null "> and ja.type = #{type}</if>
+ <if test="content != null and content != ''"> and ja.content = #{content}</if>
+ <if test="url != null and url != ''"> and ja.url = #{url}</if>
+ <if test="videoUrl != null and videoUrl != ''"> and ja.video_url = #{videoUrl}</if>
+ <if test="sourceId != null and sourceId != ''"> and ja.source_id = #{sourceId}</if>
+ <if test="sourceName != null and sourceName != ''"> and ja.source_name = #{sourceName}</if>
+ <if test="articleType != null and articleType != ''"> and ja.article_type = #{articleType}</if>
+ <if test="recommend != null "> and ja.recommend = #{recommend}</if>
+ <if test="publish != null and publish != ''"> and ja.publish = #{publish}</if>
+ <if test="iscomment != null and iscomment != ''"> and ja.iscomment = #{iscomment}</if>
+ <if test="viewNumber != null "> and ja.view_number = #{viewNumber}</if>
+ <if test="createTime != null "> and ja.create_time = #{createTime}</if>
+ <if test="updateTime != null "> and ja.update_time = #{updateTime}</if>
+ <if test="updateUser != null "> and ja.update_user = #{updateUser}</if>
+ <if test="createUser != null "> and ja.create_user = #{createUser}</if>
+ <if test="isDeleted != null "> and ja.is_deleted = #{isDeleted}</if>
+ </where>
+ and ja.is_deleted = 0
+ and ja.publish = 1
+ and bdb.parent_id = '1722966265111248897'
+ order by ja.create_time desc
+ </select>
</mapper>
--
Gitblit v1.9.3