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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 4486642..038ade7 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
@@ -63,8 +63,10 @@
         jpd.appoint_user,
         jpd.user_ids,
         jpd.event_type,
-        jpd.signature_flag
+        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>
@@ -83,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,7 +130,7 @@
         jpd.user_ids,
         jpd.event_type,
         jpd.signature_flag,
-        (SELECT user_id from jczz_user_public_enroll where user_id = #{userId} and article_id = jpd.article_id)userId
+        (SELECT household_id from jczz_user_public_enroll where household_id = #{householdId} and article_id = jpd.article_id)householdId
         from
         jczz_public_discuss jpd
         <where>

--
Gitblit v1.9.3