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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/issueClazz/mapper/IssueClazzMapper.xml

@@ -13,7 +13,7 @@

    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
        <id column="id" property="id"/>
        <result column="parent_id" property="parentId"/>
<!--        <result column="parent_id" property="parentId"/>-->
        <result column="title" property="title"/>
        <result column="value" property="value"/>
        <result column="key" property="key"/>
@@ -22,20 +22,12 @@


    <select id="tree" resultMap="treeNodeResultMap">
        SELECT
            code,
            name AS title,
            code AS "value",
            code AS "key",
            parent_code
        FROM
            ( SELECT * FROM jczz_issue_clazz ORDER BY parent_code, code )
                org_query,
            ( SELECT @id := 10 ) initialisation
        WHERE
            (FIND_IN_SET( parent_code, @id ) > 0 or FIND_IN_SET( code, @id ) > 0)
          AND @id := CONCAT(@id,',',code)

        SELECT CODE        id,
               NAME AS     title,
               CODE AS     "value",
               CODE AS     "key",
               parent_code parentId
        FROM jczz_issue_clazz
    </select>