Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/resources/mapper/MenuMapper.xml

@@ -110,14 +110,19 @@
        </if>
    </select>

    <select id="getMenuListByName" resultMap="ResultMap">
    <select id="getMenuListInfo" resultMap="ResultMap">
        select
        <include refid="Base_Column_List"/>
        from menu
        where is_delete=0
        <if test="menuName != 'null'">
            and menu_name like concat('%',#{menuName},'%')
        </if>
    </select>

    <select id="getMenuOrdersByRoleId" resultType="java.lang.Integer">
        select
        m.menu_order
        from menu m
        left join role_menu rm on m.id=rm.menu_id and m.channel_id= rm.channel_id
        where rm.role_id = #{roleId}
    </select>

</mapper>