Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-19 de3b099bc86e8bed76637e6209219ee6eaf785bd

 dao/src/main/resources/mapper/MenuMapper.xml

@@ -5,19 +5,19 @@
<mapper namespace="com.sandu.ximon.dao.mapper.MenuMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Menu">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="title" column="title" jdbcType="VARCHAR"/>
            <result property="pid" column="pid" jdbcType="BIGINT"/>
            <result property="seq" column="seq" jdbcType="INTEGER"/>
            <result property="icon" column="icon" jdbcType="VARCHAR"/>
            <result property="path" column="path" jdbcType="VARCHAR"/>
            <result property="hidden" column="hidden" jdbcType="BOOLEAN"/>
            <result property="component" column="component" jdbcType="VARCHAR"/>
            <result property="routerName" column="router_name" jdbcType="VARCHAR"/>
            <result property="permission" column="permission" jdbcType="VARCHAR"/>
            <result property="type" column="type" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="title" column="title" jdbcType="VARCHAR"/>
        <result property="pid" column="pid" jdbcType="BIGINT"/>
        <result property="seq" column="seq" jdbcType="INTEGER"/>
        <result property="icon" column="icon" jdbcType="VARCHAR"/>
        <result property="path" column="path" jdbcType="VARCHAR"/>
        <result property="hidden" column="hidden" jdbcType="BOOLEAN"/>
        <result property="component" column="component" jdbcType="VARCHAR"/>
        <result property="routerName" column="router_name" jdbcType="VARCHAR"/>
        <result property="permission" column="permission" jdbcType="VARCHAR"/>
        <result property="type" column="type" jdbcType="INTEGER"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
@@ -47,4 +47,19 @@
        </where>

    </select>

    <select id="listMenuById" resultType="com.sandu.ximon.dao.domain.Menu">
        SELECT
        *
        FROM
        menu t1
        <where>
            t1.id IN
            <foreach collection="menuIdList" open="(" close=")" item="id" separator=",">
                #{id}
            </foreach>
        </where>
        ORDER BY t1.seq ASC

    </select>
</mapper>