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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/RoleMapper.xml

@@ -65,6 +65,36 @@
        ORDER BY sort
    </select>

    <select id="treeByParentIdNew" resultMap="treeNodeResultMap">
        select id, parent_id, role_name as title, id as "value", id as "key" from blade_role where is_deleted = 0
        <if test="_parameter!=null and _parameter!=''">
            and (
            (
            <foreach collection="array" item="parentId" index="index" open="(" close=")" separator="or">
                id = #{parentId}
            </foreach>
            )
            or
            (
            <foreach collection="array" item="parentId" index="index" open="(" close=")" separator="or">
                parent_id = #{parentId}
            </foreach>
            )

            or parent_id in (
            select b.id from blade_role b where b.is_deleted = 0 and
            (
            <foreach collection="array" item="parentId" index="index" open="(" close=")" separator="or">
                b.PARENT_ID = #{parentId}
            </foreach>
            )

            )
            )
        </if>
        ORDER BY sort
    </select>

    <select id="getRoleNames" resultType="java.lang.String">
        SELECT
        role_name