From a1d8ea1a72cddf7651742b87f042602ab006c879 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 17:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 596042f..e73c0fc 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -62,16 +62,20 @@
article_type,
recommend,
publish,
- iscomment,
- view_number,
- create_time,
- update_time,
- update_user,
- create_user,
- is_deleted
+ iscomment,
+ view_number,
+ create_time,
+ update_time,
+ update_user,
+ create_user,
+ is_deleted
from jczz_article
where is_deleted = 0
- and publish = 1
+ and publish = 1
+ <if test="article.articleType != null and article.articleType != ''">
+ and article_type = #{article.articleType}
+ </if>
+ order by create_time desc
</select>
<!--查询资讯分页列表信息-->
--
Gitblit v1.9.3