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

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

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

@@ -4,19 +4,25 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="menuResultMap" type="org.springblade.modules.system.entity.Menu">
        <id column="id" property="id"/>
        <result column="code" property="code"/>
        <result column="parent_id" property="parentId"/>
        <result column="name" property="name"/>
        <result column="alias" property="alias"/>
        <result column="path" property="path"/>
        <result column="source" property="source"/>
        <result column="sort" property="sort"/>
        <result column="category" property="category"/>
        <result column="action" property="action"/>
        <result column="is_open" property="isOpen"/>
        <result column="remark" property="remark"/>
        <result column="is_deleted" property="isDeleted"/>
        <result property="id"    column="id"    />
        <result property="parentId"    column="parent_id"    />
        <result property="code"    column="code"    />
        <result property="name"    column="name"    />
        <result property="alias"    column="alias"    />
        <result property="path"    column="path"    />
        <result property="source"    column="source"    />
        <result property="sort"    column="sort"    />
        <result property="category"    column="category"    />
        <result property="action"    column="action"    />
        <result property="isOpen"    column="is_open"    />
        <result property="component"    column="component"    />
        <result property="remark"    column="remark"    />
        <result property="isDeleted"    column="is_deleted"    />
        <result property="pictureImg"    column="picture_img"    />
        <result property="labelId"    column="label_id"    />
        <result property="background"    column="background"    />
        <result property="labelStr"    column="label_str"    />
        <result property="menuType" column="menu_type"/>
    </resultMap>

    <resultMap id="menuVOResultMap" type="org.springblade.modules.system.vo.MenuVO">
@@ -32,6 +38,7 @@
        <result column="action" property="action"/>
        <result column="is_open" property="isOpen"/>
        <result column="remark" property="remark"/>
        <result property="menuType" column="menu_type"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="has_children" property="hasChildren"/>
    </resultMap>
@@ -43,6 +50,31 @@
        <result column="value" property="value"/>
        <result column="key" property="key"/>
    </resultMap>

    <sql id="selectBladeMenu">
        select
            id,
            parent_id,
            code,
            name,
            alias,
            path,
            source,
            sort,
            category,
            action,
            is_open,
            component,
            remark,
            is_deleted,
            picture_img,
            label_id,
            background,
            label_str,
            menu_type
        from
            blade_menu
    </sql>


    <select id="lazyList" resultMap="menuVOResultMap">
@@ -108,7 +140,10 @@
    </select>

    <select id="allMenu" resultMap="menuResultMap">
        select * from blade_menu where is_deleted = 0 and category = 1
        select *
        from blade_menu
        where is_deleted = 0
          and category = 1
    </select>

    <select id="roleMenu" resultMap="menuResultMap">
@@ -127,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>
            )