From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 54b12d8..1e5ce94 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -87,9 +87,7 @@
ja.update_user,
ja.create_user,
ja.is_deleted,
- jpd.id pdId,
- (select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1722966265111248897' and ja.article_type = bdb.dict_key) dictValue,
- jpd.event_type
+ jpd.id pdId
from jczz_article ja
LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
where ja.is_deleted = 0
@@ -99,6 +97,14 @@
</if>
<if test="article.eventType != null">
and jpd.event_type = #{article.eventType}
+ </if>
+
+ <if test="article.type != null">
+ and ja.type = #{article.type}
+ </if>
+
+ <if test="article.type == null">
+ and ja.type = 0
</if>
<if test="article.districtId != null and article.districtId != ''">
@@ -134,9 +140,17 @@
and ja.article_type = #{article.articleType}
</if>
+ <if test="article.type != null">
+ and ja.type = #{article.type}
+ </if>
+
+ <if test="article.type == null">
+ and ja.type = 0
+ </if>
+
<if test="article.districtId != null and article.districtId != ''">
- and ja.article_range like concat('%',#{article.districtId},'%')
- or ja.article_range is null
+ and (ja.article_range like concat('%',#{article.districtId},'%')
+ or ja.article_range is null)
</if>
</if>
@@ -169,6 +183,7 @@
AND CONCAT(title,source_name)
LIKE CONCAT ('%', #{article.keyword},'%')
</if>
+ <if test="article.type != null ">and type = #{article.type}</if>
and is_deleted = 0
order by id desc
--
Gitblit v1.9.3