From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/resources/mapper/MenuMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/MenuMapper.xml b/screen-api/src/main/resources/mapper/MenuMapper.xml
index 28df161..abfa655 100644
--- a/screen-api/src/main/resources/mapper/MenuMapper.xml
+++ b/screen-api/src/main/resources/mapper/MenuMapper.xml
@@ -21,24 +21,24 @@
<select id="selectUserMenu" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List"></include>
+ <include refid="Base_Column_List"/>
FROM `user_group` ug,`group_menu` gm,`menu` m
WHERE ug.user_id = #{userId}
AND ug.group_id = gm.group_id
AND gm.menu_id = m.id
AND ug.is_delete = 0
AND gm.is_delete = 0
- AND gm.channel = 1
+ AND gm.channel_key = 1
AND m.is_delete = 0
</select>
<select id="selectOrganizationMenu" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List"></include>
+ <include refid="Base_Column_List"/>
FROM `menu` m, `organization_menu` om
WHERE om.organization_id = #{orgId}
AND m.id = om.menu_id
- AND om.channel = 1
+ AND om.channel_key = 1
AND om.menu_id = m.id
AND om.is_delete = 0
AND m.is_delete = 0
--
Gitblit v1.8.0