Merge remote-tracking branch 'origin/master'

lin

2024-02-28 92a3b953f2da493e68afb9ae73a15b6513a6c18a

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

@@ -162,9 +162,9 @@
    </select>

    <select id="roleMenuByRoleId" resultMap="menuResultMap">
        select * from blade_menu where is_deleted = 0 and id IN
        select * from blade_menu where is_deleted = 0 and menu_type = #{param2} and id  IN
            ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
                <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
                <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            )