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 |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/MenuMapper.xml b/screen-api/src/main/resources/mapper/MenuMapper.xml
index 93e8258..abfa655 100644
--- a/screen-api/src/main/resources/mapper/MenuMapper.xml
+++ b/screen-api/src/main/resources/mapper/MenuMapper.xml
@@ -15,4 +15,32 @@
         <result column="is_delete" property="isDelete"/>
     </resultMap>
 
+    <sql id="Base_Column_List">
+        m.id, m.name, m.url, m.icon, m.parent_id, m.order, m.create_time, m.update_time
+    </sql>
+
+    <select id="selectUserMenu" resultMap="BaseResultMap">
+        select
+        <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_key = 1
+        AND m.is_delete = 0
+    </select>
+
+    <select id="selectOrganizationMenu" resultMap="BaseResultMap">
+        select
+        <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_key = 1
+        AND om.menu_id = m.id
+        AND om.is_delete = 0
+        AND m.is_delete = 0
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0