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 |   21 +++++++++++++++++++--
 1 files changed, 19 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 54b12d8..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

--
Gitblit v1.9.3