From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/mapper/PublicDiscussMapper.xml | 5 +++--
1 files changed, 3 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..a9af06d 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,10 @@
jpd.appoint_user,
jpd.user_ids,
jpd.event_type,
- jupe.user_id userId
+ jpd.signature_flag,
+ (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