From 2193832ff5b8424d4ed16d0dc7ee779151c0e704 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 15 Apr 2024 11:37:15 +0800
Subject: [PATCH] 轮播图查询议事 bug 修复+ 统战部事件上报类型

---
 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 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 24d2f70..3ea461f 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -552,7 +552,6 @@
         <if test="article.eventType != null">
             and jpd.event_type = #{article.eventType}
             and jpd.end_time is not null
-            and jpd.end_time &lt;= SYSDATE()
         </if>
 
         <if test="article.propertyFlag!=null ">
@@ -583,7 +582,9 @@
         <if test="article.articleType!=null and article.articleType!=''">
             and ja.article_type like concat('%',#{article.articleType},'%')
         </if>
-        <if test="article.type != null ">and ja.type = #{article.type}</if>
+        <if test="article.type != null ">
+          and ja.type = #{article.type}
+          </if>
 
         <if test="article.keyword!=null and article.keyword!=''">
             AND CONCAT(ja.title,ja.source_name)

--
Gitblit v1.9.3