From eb844e3260657b6bb9de03c1e5feca50bdf8190d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 17 十一月 2021 13:50:58 +0800
Subject: [PATCH] fix 修复 OssFactory 在程序启动未调用api 没有初始化 导致无法订阅配置更改问题
---
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index ca4ef65..bfb5436 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -12,7 +12,8 @@
<result property="orderNum" column="order_num"/>
<result property="path" column="path"/>
<result property="component" column="component"/>
- <result property="isFrame" column="is_frame"/>
+ <result property="query" column="query"/>
+ <result property="isFrame" column="is_frame"/>
<result property="isCache" column="is_cache"/>
<result property="menuType" column="menu_type"/>
<result property="visible" column="visible"/>
@@ -33,6 +34,7 @@
order_num,
path,
component,
+ query,
is_frame,
is_cache,
menu_type,
@@ -51,7 +53,8 @@
m.menu_name,
m.path,
m.component,
- m.visible,
+ m.query,
+ m.visible,
m.status,
ifnull(m.perms, '') as perms,
m.is_frame,
@@ -67,7 +70,7 @@
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status,
+ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status,
ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -92,6 +95,7 @@
m.menu_name,
m.path,
m.component,
+ m.query,
m.visible,
m.status,
ifnull(m.perms, '') as perms,
@@ -113,7 +117,7 @@
order by m.parent_id, m.order_num
</select>
- <select id="selectMenuListByRoleId" resultType="Integer">
+ <select id="selectMenuListByRoleId" resultType="Long">
select m.menu_id
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -143,4 +147,4 @@
and ur.user_id = #{userId}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3