From 9d521d0ff5fe8b09ceb9d7f2ec0f883048860810 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 04 Jan 2024 18:32:30 +0800
Subject: [PATCH] bug修复+通过小区id 查询小区的楼栋和单元
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 1e5ce94..635bb0c 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -23,7 +23,7 @@
<result column="update_user" property="updateUser"/>
<result column="create_user" property="createUser"/>
<result column="is_deleted" property="isDeleted"/>
- <result property="articleRange" column="article_range" />
+ <result property="articleRange" column="article_range"/>
<collection property="countNumber" column="id" javaType="int" select="selectStlCount">
</collection>
@@ -38,7 +38,6 @@
and jnl.delete_flag = 0
and jn.id = #{id}
</select>
-
<sql id="selectArticle">
@@ -61,7 +60,9 @@
update_user,
create_user,
is_deleted,
- article_range
+ article_range,
+ building,
+ unit
from
jczz_article
</sql>
@@ -111,6 +112,15 @@
and (ja.article_range like concat('%',#{article.districtId},'%')
or ja.article_range is null)
</if>
+ <if test="article.building != null and article.building != ''">
+ and (ja.building = #{article.building}
+ or ja.building is null)
+ </if>
+
+ <if test="article.unit != null and article.unit != ''">
+ and (ja.unit = #{article.unit}
+ or ja.unit is null)
+ </if>
</if>
<!-- 查询文章 -->
<if test="article.eventType == null">
@@ -151,6 +161,16 @@
<if test="article.districtId != null and article.districtId != ''">
and (ja.article_range like concat('%',#{article.districtId},'%')
or ja.article_range is null)
+ </if>
+
+ <if test="article.building != null and article.building != ''">
+ and (ja.building = #{article.building}
+ or ja.building is null)
+ </if>
+
+ <if test="article.unit != null and article.unit != ''">
+ and (ja.unit = #{article.unit}
+ or ja.unit is null)
</if>
</if>
@@ -242,7 +262,7 @@
sys_collect col
LEFT JOIN jczz_article art on art.id = col.collect_article
WHERE
- 1 = 1 AND collect_user = #{article.userid}
+ 1 = 1 AND collect_user = #{article.userid}
<if test="article.articleType!=null and article.articleType!=''">
and article_type LIKE CONCAT ('%', #{article.articleType},'%')
</if>
--
Gitblit v1.9.3