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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

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

@@ -53,12 +53,18 @@
        role_alias
        FROM
        blade_role
        WHERE
        id IN
        <foreach collection="array" item="ids" index="index" open="(" close=")" separator=",">
            #{ids}
        </foreach>
        and is_deleted = 0
        WHERE is_deleted = 0
        <choose>
            <when test="array!=null and array.length>0">
                and id IN
                <foreach collection="array" item="ids" index="index" open="(" close=")" separator=",">
                    #{ids}
                </foreach>
            </when>
            <otherwise>
                and id IN ('')
            </otherwise>
        </choose>
    </select>
    <select id="getRoleListByIds" resultType="org.springblade.modules.system.entity.Role">
        SELECT * FROM BLADE_ROLE
@@ -68,6 +74,21 @@
        </foreach>
    </select>

    <!--查询对应的角色id-->
    <select id="getRoleIdStrByRoleIdAndType" resultType="java.lang.String">
        SELECT id FROM BLADE_ROLE
        WHERE id IN
        <foreach collection="ids.split(',')" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
        <if test="types!=null and types.size()>0">
            and type in
            <foreach collection="types" item="type" open="(" separator="," close=")">
                #{type}
            </foreach>
        </if>
    </select>

    <!--角色查询-->
    <select id="getRoleList" resultType="org.springblade.modules.system.entity.Role">
        SELECT br.* FROM blade_role br