From aabce4b306d3fb996a64ad41d40bc5629512d2fa Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 20 Apr 2024 10:01:01 +0800
Subject: [PATCH] 议事问题优化
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 9 ++++++---
1 files changed, 6 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 dd647d3..171bc4e 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -196,7 +196,7 @@
jhs.district_name
FROM
jczz_user_topics as jut
- LEFT JOIN jczz_household jh ON jh.id = jut.household_id and jh.is_deleted = 0
+ LEFT JOIN jczz_household jh ON jh.id = jut.household_id
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
LEFT JOIN jczz_topics jt on jt.id = jut.topics_id
LEFT JOIN blade_user bu ON jh.associated_user_id = bu.id AND bu.is_deleted = 0
@@ -233,11 +233,13 @@
</select>
<select id="getHouseholdList" resultType="org.springblade.modules.discuss.excel.holdExcel">
SELECT
- DISTINCT(jh.id),
+ jh.id,
jh.room,
jh.building,
jh.house_name,
jh.district_name,
+ jut.create_time,
+ jh.area,
(
SELECT
group_concat( jt.id ) AS optionContent
@@ -253,7 +255,7 @@
FROM
jczz_house jh
LEFT JOIN jczz_household jhd ON jhd.house_code = jh.house_code
- AND jh.is_deleted = 0
+ AND jh.is_deleted = 0 and jhd.relationship = 1
LEFT JOIN jczz_user_topics jut on jut.household_id = jhd.id
<where>
<if test="aoiCodeList != null and aoiCodeList.size() > 0">
@@ -263,6 +265,7 @@
</foreach>
</if>
</where>
+ GROUP BY id
</select>
--
Gitblit v1.9.3