From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/resources/mapper/MenuMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/MenuMapper.xml b/screen-api/src/main/resources/mapper/MenuMapper.xml
index 8ae2d80..261a915 100644
--- a/screen-api/src/main/resources/mapper/MenuMapper.xml
+++ b/screen-api/src/main/resources/mapper/MenuMapper.xml
@@ -32,6 +32,19 @@
AND gm.menu_id = m.id
AND ug.is_delete = 0
AND gm.is_delete = 0
+ AND gm.channel = 1
+ AND m.is_delete = 0
+ ORDER by m.`order`
+ </select>
+
+ <select id="selectOrganizationMenu" resultMap="MenuResultMap">
+ SELECT m.id,m.name,m.url,m.icon,m.parent_id,m.order
+ FROM `menu` m, `organization_menu` om
+ WHERE om.organization_id = #{orgId}
+ AND m.id = om.menu_id
+ AND om.channel = 1
+ AND om.menu_id = m.id
+ AND om.is_delete = 0
AND m.is_delete = 0
ORDER by m.`order`
</select>
--
Gitblit v1.8.0