Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -45,6 +45,7 @@
        <include refid="selectTopics"/>
        <where>
            <if test="id != null "> parent_id = #{id}</if>
             and delete_flag = 0
        </where>
    </select>

@@ -86,8 +87,11 @@
        jt.delete_flag,
        jt.public_discuss_id,
        jt.parent_id,
        jt.article_id,
        jt.LEVEL,
        ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.topics_id = jt.id AND jut.user_id = #{userId} ) selected
        ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.article_id = jt.article_id AND jut.user_id = #{userId}
        limit 1
        ) selected
        FROM
        jczz_topics jt
        <where>
@@ -104,6 +108,7 @@
            <if test="publicDiscussId != null "> and jt.public_discuss_id = #{publicDiscussId}</if>
            <if test="parentId != null "> and jt.parent_id = #{parentId}</if>
            <if test="level != null "> and jt.level = #{level}</if>
            <if test="articleId != null ">and jt.article_id = #{articleId}</if>
            and jt.delete_flag = 0
        </where>
    </select>