Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml

@@ -105,7 +105,14 @@
        jt.option_number,
        jt.mandatory_flag,
        jt.attachment,
        ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.article_id = jt.article_id AND jut.user_id = #{userId}
        (   SELECT
        jut.selected
        FROM
        jczz_user_topics jut
        LEFT JOIN jczz_topics jts ON jts.id = jut.topics_id
        WHERE
        jut.article_id = jt.article_id
        AND jts.parent_id = jt.id  AND jut.user_id = #{userId}
        limit 1
        ) selected
        FROM