From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200
---
src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
index c49a80e..038ade7 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
@@ -47,25 +47,26 @@
<select id="selectPublicDiscussPage" resultMap="publicDiscussResultMap">
- select id,
- title,
- open_flag,
- number_restrictions,
- vote_restrictions,
- user_restrictions,
- end_time,
- article_id,
- create_time,
- update_time,
- deleted_flag,
- repeat_vote,
- vote_number_public,
- appoint_user,
- user_ids,
- event_type,
- (SELECT count(1) FROM jczz_user_public_enroll where public_discuss_id = id) enrollCount,
- (SELECT count(1) FROM jczz_user_topics where public_discuss_id = id) topsCount
- from jczz_public_discuss
+ select jpd.id,
+ jpd.title,
+ jpd.open_flag,
+ jpd.number_restrictions,
+ jpd.vote_restrictions,
+ jpd.user_restrictions,
+ jpd.end_time,
+ jpd.article_id,
+ jpd.create_time,
+ jpd.update_time,
+ jpd.deleted_flag,
+ jpd.repeat_vote,
+ jpd.vote_number_public,
+ jpd.appoint_user,
+ jpd.user_ids,
+ jpd.event_type,
+ jpd.signature_flag,
+ GROUP_CONCAT(jh.name) userName
+ from jczz_public_discuss jpd
+ LEFT JOIN jczz_household jh ON FIND_IN_SET ( jh.id, jpd.user_ids )
<where>
<if test="publicDiscuss.id != null "> and id = #{publicDiscuss.id}</if>
<if test="publicDiscuss.title != null and publicDiscuss.title != ''"> and title = #{publicDiscuss.title}</if>
@@ -84,6 +85,7 @@
<if test="publicDiscuss.userIds != null and publicDiscuss.userIds != ''"> and user_ids = #{publicDiscuss.userIds}</if>
<if test="publicDiscuss.eventType != null "> and event_type = #{publicDiscuss.eventType}</if>
</where>
+ GROUP BY jpd.id
</select>
<select id="selectPublicDiscussList" parameterType="org.springblade.modules.discuss.dto.PublicDiscussDTO" resultMap="publicDiscussResultMap">
@@ -127,11 +129,12 @@
jpd.appoint_user,
jpd.user_ids,
jpd.event_type,
- jupe.user_id userId
+ jpd.signature_flag,
+ (SELECT household_id from jczz_user_public_enroll where household_id = #{householdId} and article_id = jpd.article_id)householdId
from
- jczz_public_discuss jpd LEFT JOIN jczz_user_public_enroll jupe on jupe.public_discuss_id = jpd.id
+ jczz_public_discuss jpd
<where>
- <if test="id != null "> and jpd.id = #{id}</if>
+ <if test="articleId != null ">and jpd.article_id = #{articleId}</if>
</where>
</select>
--
Gitblit v1.9.3