Merge remote-tracking branch 'origin/master'

linwe

2023-12-06 1a47d5fe54230e312aa8486aad7fb30ada1f7b2b

 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>