From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index bfb5436..d441c73 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -27,33 +27,13 @@
<result property="remark" column="remark"/>
</resultMap>
- <sql id="selectMenuVo">
- select menu_id,
- menu_name,
- parent_id,
- order_num,
- path,
- component,
- query,
- is_frame,
- is_cache,
- menu_type,
- visible,
- status,
- ifnull(perms, '') as perms,
- icon,
- create_time
- from sys_menu
- </sql>
-
-
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id,
m.parent_id,
m.menu_name,
m.path,
m.component,
- m.query,
+ m.`query`,
m.visible,
m.status,
ifnull(m.perms, '') as perms,
@@ -70,7 +50,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.query, 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
@@ -95,7 +75,7 @@
m.menu_name,
m.path,
m.component,
- m.query,
+ m.`query`,
m.visible,
m.status,
ifnull(m.perms, '') as perms,
--
Gitblit v1.9.3