From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/resources/mapper/MenuMapper.xml | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/MenuMapper.xml b/screen-api/src/main/resources/mapper/MenuMapper.xml
index 261a915..2634fdb 100644
--- a/screen-api/src/main/resources/mapper/MenuMapper.xml
+++ b/screen-api/src/main/resources/mapper/MenuMapper.xml
@@ -15,37 +15,31 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <resultMap id="MenuResultMap" type="com.moral.api.entity.Menu">
- <id column="id" property="id"/>
- <result column="name" property="name"/>
- <result column="url" property="url"/>
- <result column="icon" property="icon"/>
- <result column="parent_id" property="parentId"/>
- <result column="order" property="order" jdbcType="INTEGER"/>
- </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="MenuResultMap">
- SELECT DISTINCT m.id,m.name,m.url,m.icon,m.parent_id,m.order
+ <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 = 1
+ AND gm.channel_key = 0
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
+ <select id="selectOrganizationMenu" resultMap="BaseResultMap">
+ SELECT
+ DISTINCT m.id, m.name, m.url, m.icon, m.parent_id, m.order, m.create_time, m.update_time
+ FROM `menu` m, `group_menu` gm
+ WHERE gm.organization_id = #{orgId}
+ AND m.id = gm.menu_id
+ AND gm.channel_key = 0
+ AND gm.is_delete = 0
AND m.is_delete = 0
- ORDER by m.`order`
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0