From 2b1a74f4faa5a00a294bdc6a6d956c2e009cf467 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 16 Apr 2024 15:32:09 +0800
Subject: [PATCH] 管理员过滤文章
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 745cf47..2422490 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>
@@ -190,7 +190,10 @@
jhs.remark,
jda.address_code houseCode,
jda.aoi_name,
- jt.option_content
+ jt.option_content,
+ jhs.building,
+ jhs.room,
+ 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
@@ -199,6 +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 != '管理公约'
<if test="id != null ">and jut.id = #{id}</if>
<if test="name != null and name != ''">
and bu.name like concat('%',#{name},'%')
@@ -226,29 +231,36 @@
</where>
</select>
- <select id="getHouseholdList" resultType="org.springblade.modules.discuss.excel.householdExcel">
+ <select id="getHouseholdList" resultType="org.springblade.modules.discuss.excel.holdExcel">
SELECT
DISTINCT(jh.id),
- jh.*,
+ jh.room,
+ jh.building,
+ jh.house_name,
+ jh.district_name,
+ jut.create_time,
+ jh.area,
(
SELECT
- group_concat( jt.option_content ) AS optionContent
+ group_concat( jt.id ) AS optionContent
FROM
jczz_user_topics jut
LEFT JOIN jczz_topics jt ON jt.id = jut.topics_id
WHERE
jut.house_code = jh.house_code
AND jut.article_id = #{articleId}
- ) selectd
+ ) optionContent,
+ (SELECT jhd.name from jczz_household jhd where jhd.house_code = jh.house_code AND jhd.is_deleted = 0 and jhd.relationship = 1 limit 1 ) name,
+ (SELECT jhd.phone_number from jczz_household jhd where jhd.house_code = jh.house_code AND jhd.is_deleted = 0 and jhd.relationship = 1 limit 1 ) phone
FROM
jczz_house jh
LEFT JOIN jczz_household jhd ON jhd.house_code = jh.house_code
AND jh.is_deleted = 0
LEFT JOIN jczz_user_topics jut on jut.household_id = jhd.id
<where>
- <if test="districtIdList != null and districtIdList.size() > 0">
+ <if test="aoiCodeList != null and aoiCodeList.size() > 0">
and jh.district_code in
- <foreach collection="districtIdList" item="code" open="(" close=")" separator=",">
+ <foreach collection="aoiCodeList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
</if>
--
Gitblit v1.9.3