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