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 | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 dacf6bd..038ade7 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
@@ -62,8 +62,11 @@
jpd.vote_number_public,
jpd.appoint_user,
jpd.user_ids,
- jpd.event_type
+ 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>
@@ -82,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">
@@ -125,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