From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 11 ++++++++++-
1 files changed, 10 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 b423492..fa4fa6b 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -95,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>
@@ -132,6 +139,8 @@
AND CONCAT(title,source_name)
LIKE CONCAT ('%', #{article.keyword},'%')
</if>
+
+ and is_deleted = 0
order by id desc
</select>
--
Gitblit v1.9.3