Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/mapper/DictBizMapper.xml

@@ -15,11 +15,12 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>

    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
    <resultMap id="treeNodeResultMap" type="org.springblade.modules.system.entity.TreeNodeTwo">
        <id column="id" property="id"/>
        <result column="parent_id" property="parentId"/>
        <result column="title" property="title"/>
        <result column="value" property="value"/>
        <result column="remark" property="remark"/>
        <result column="key" property="key"/>
    </resultMap>

@@ -53,6 +54,9 @@
            and parent_id > 0
            and is_sealed = 0
            and is_deleted = 0
        <if test="param2!=null">
            and parent_id = #{param2}
        </if>
    </select>

    <select id="tree" resultMap="treeNodeResultMap">
@@ -62,6 +66,7 @@
        dict_value AS title,
        id AS "value",
        dict_key AS "key",
        remark,
        (
        SELECT
        CASE WHEN count(1) > 0 THEN 1 ELSE 0 END