From 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 21 Dec 2023 14:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml |    4 ++--
 1 files changed, 2 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 dacf6bd..59ae9ac 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml
@@ -125,9 +125,9 @@
         jpd.appoint_user,
         jpd.user_ids,
         jpd.event_type,
-        jupe.user_id userId
+        (SELECT user_id from jczz_user_public_enroll where user_id = #{userId} and public_discuss_id = jpd.id)userId
         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>
         </where>

--
Gitblit v1.9.3