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

guoshilong

2023-05-23 76d9d4af124631ffe68c5f8dfd2c6d54c61fcefa

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

@@ -39,8 +39,26 @@
        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 (
                id = #{_parameter} or parent_id = #{_parameter} or parent_id in (
                select b.id from blade_role b where b.is_deleted = 0 and b.PARENT_ID = #{_parameter}
                (
                    <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>
                    )

                ) or role_alias like '%zrr'
            )
        </if>