Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -11,12 +11,17 @@
        <result property="optionContent"    column="option_content"    />
        <result property="optionDetail"    column="option_detail"    />
        <result property="number"    column="number"    />
        <result property="createTime"    column="crete_time"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateTime"    column="update_time"    />
        <result property="deleteFlag"    column="delete_flag"    />
        <result property="publicDiscussId"    column="public_discuss_id"    />
        <result property="parentId"    column="parent_id"    />
        <result property="level"    column="level"    />
        <result property="selected"    column="selected"    />
        <result property="articleId"    column="article_id"    />
        <result property="optionNumber"    column="option_number"    />
        <result property="mandatoryFlag"    column="mandatory_flag"    />
        <result property="attachment"    column="attachment"    />
    </resultMap>


@@ -35,6 +40,10 @@
        <result property="parentId"    column="parent_id"    />
        <result property="level"    column="level"    />
        <result property="selected"    column="selected"    />
        <result property="articleId"    column="article_id"    />
        <result property="optionNumber"    column="option_number"    />
        <result property="mandatoryFlag"    column="mandatory_flag"    />
        <result property="attachment"    column="attachment"    />
        <collection property="children" column="id" javaType="list" ofType="org.springblade.modules.discuss.dto.TopicsDTO"  select="selectStlCount">
        </collection>

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

@@ -64,7 +74,11 @@
            public_discuss_id,
            parent_id,
            level,
            selected
            selected,
            article_id,
            option_number,
            mandatory_flag,
            attachment
        from
            jczz_topics
    </sql>
@@ -88,7 +102,17 @@
        jt.parent_id,
        jt.article_id,
        jt.LEVEL,
        ( SELECT jut.selected FROM jczz_user_topics jut WHERE jut.article_id = jt.article_id AND jut.user_id = #{userId}
        jt.option_number,
        jt.mandatory_flag,
        jt.attachment,
        (   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