From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 d3c19cc..c88e9ba 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -101,6 +101,14 @@
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 != ''">
and (ja.article_range like concat('%',#{article.districtId},'%')
or ja.article_range is null)
@@ -134,9 +142,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 +185,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
@@ -427,8 +444,9 @@
ja.create_user,
ja.is_deleted,
ja.article_range,
- bdb.dict_value dictValue
- from jczz_article ja LEFT JOIN blade_dict_biz bdb on ja.article_type = bdb.dict_key
+ ((select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1722966265111248897' and ja.article_type
+ = bdb.dict_key)) dictValue
+ from jczz_article ja
<where>
<if test="id != null ">and ja.id = #{id}</if>
<if test="title != null and title != ''">and ja.title = #{title}</if>
@@ -451,8 +469,6 @@
<if test="articleRange != null and articleRange != ''">and article_range = #{articleRange}</if>
</where>
and ja.is_deleted = 0
- and ja.publish = 1
- and bdb.parent_id = '1722966265111248897'
order by ja.create_time desc
</select>
--
Gitblit v1.9.3