From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index 9de46ab..d0e3e6e 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -111,7 +111,7 @@
jda.address_name,
jhs.area,
jhs.remark,
- jda.houseCode,
+ jda.address_code houseCode,
jda.aoi_name
<if test="articleId != null ">,
group_concat(jt.option_content) optionContent </if>
@@ -153,7 +153,7 @@
jda.address_name,
jhs.area,
jhs.remark,
- jda.houseCode,
+ jda.address_code,
jda.aoi_name
</if>
</where>
@@ -202,7 +202,8 @@
LEFT JOIN blade_user bu ON jh.associated_user_id = bu.id AND bu.is_deleted = 0
LEFT JOIN jczz_house jhs on jhs.house_code= jda.address_code
<where>
- and jt.discuss_content = '候选人'
+ and jt.discuss_content != '议事规则'
+ and jt.discuss_content != '管理规约'
<if test="id != null ">and jut.id = #{id}</if>
<if test="name != null and name != ''">
and bu.name like concat('%',#{name},'%')
--
Gitblit v1.9.3