From ae3ed0924c3e567da8e8914de09e6d41fc108bd6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 27 十一月 2024 10:34:55 +0800
Subject: [PATCH] 1
---
se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java | 2 +-
se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml | 6 +++++-
docker-compose/mysql/initdb/se_cloud_20240629.sql | 17 ++++++++++++++++-
se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java | 16 +++++++---------
4 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/docker-compose/mysql/initdb/se_cloud_20240629.sql b/docker-compose/mysql/initdb/se_cloud_20240629.sql
index 5538e84..5aac501 100644
--- a/docker-compose/mysql/initdb/se_cloud_20240629.sql
+++ b/docker-compose/mysql/initdb/se_cloud_20240629.sql
@@ -164,7 +164,7 @@
update_time datetime comment '鏇存柊鏃堕棿',
remark varchar(500) default '' comment '澶囨敞',
primary key (menu_id)
-) engine=innodb auto_increment=1070 comment = '鑿滃崟鏉冮檺琛�';
+) engine=innodb auto_increment=1200 comment = '鑿滃崟鏉冮檺琛�';
-- ----------------------------
-- 鍒濆鍖�-鑿滃崟淇℃伅琛ㄦ暟鎹�
@@ -269,6 +269,21 @@
-- insert into sys_menu values('1058', '瀵煎叆浠ｇ爜', '115', '2', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 'admin', sysdate(), '', null, '');
-- insert into sys_menu values('1059', '棰勮浠ｇ爜', '115', '4', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', sysdate(), '', null, '');
-- insert into sys_menu values('1060', '鐢熸垚浠ｇ爜', '115', '5', '#', '', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', sysdate(), '', null, '');
+-- 棣栭〉
+insert into sys_menu values('1061', 'xx瀹為獙鏉′欢寤鸿', '0', '1', '#', '', '', '', 1, 0, 'M', '0', '0', 'system:index:sy', '#', 'admin', sysdate(), '', null, '棣栭〉', 'index');
+insert into sys_menu values('1062', 'xx姒傚康寮�鍙戜笌楠岃瘉骞冲彴', '1061', '1', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:glkf', '#', 'admin', sysdate(), '', null, '姒傚康寮�鍙戜笌楠岃瘉骞冲彴', 'index');
+insert into sys_menu values('1063', 'xx浣撶郴璁捐涓庤瘎浼板钩鍙�', '1061', '2', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:txsj', '#', 'admin', sysdate(), '', null, '浣撶郴璁捐涓庤瘎浼板钩鍙�', 'index');
+insert into sys_menu values('1064', 'xx鏂规鎺ㄦ紨涓庡垎鏋愬钩鍙�', '1061', '3', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:faty', '#', 'admin', sysdate(), '', null, '鏂规鎺ㄦ紨涓庡垎鏋愬钩鍙�', 'index');
+insert into sys_menu values('1065', 'xx鍒涘缓涓巟x杩愮敤鐮旂┒骞冲彴', '1061', '4', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:cxyyy','#', 'admin', sysdate(), '', null, '鍒涘缓涓庤繍鐢ㄧ爺绌跺钩鍙�', 'index');
+insert into sys_menu values('1066', 'xx缁煎悎闆嗘垚鐮旇鍘�', '1061', '5', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:zhjc', '#', 'admin', sysdate(), '', null, '缁煎悎闆嗘垚鐮旇鍘�', 'index');
+insert into sys_menu values('1067', '鎬佸娍鏄剧ず鍒嗙郴缁�', '1061', '6', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:tsxs', '#', 'admin', sysdate(), '', null, '鎬佸娍鏄剧ず鍒嗙郴缁�', 'index');
+insert into sys_menu values('1068', '鏁版嵁绠＄悊鍒嗙郴缁�', '1061', '7', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:sjgl', '#', 'admin', sysdate(), '', null, '鏁版嵁绠＄悊鍒嗙郴缁�', 'index');
+insert into sys_menu values('1069', '瑁呭搴�', '1061', '8', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:zbk', '#', 'admin', sysdate(), '', null, '瑁呭搴�', 'index');
+insert into sys_menu values('1070', '浠跨湡璧勬簮绠＄悊鍒嗙郴缁�', '1061', '9', '#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:fzzy', '#', 'admin', sysdate(), '', null, '浠跨湡璧勬簮绠＄悊鍒嗙郴缁�', 'index');
+insert into sys_menu values('1071', '宸ュ叿绠�', '1061', '10','#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:gjx', '#', 'admin', sysdate(), '', null, '宸ュ叿绠�', 'index');
+insert into sys_menu values('1072', '鐢ㄦ埛鍙婃潈闄愮鐞�', '1061', '11','#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:yhgl', '#', 'admin', sysdate(), '', null, '鐢ㄦ埛鍙婃潈闄愮鐞�', 'index');
+insert into sys_menu values('1073', '鐩戞帶鍙婅繍缁寸鐞�', '1061', '12','#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:ywjk', '#', 'admin', sysdate(), '', null, '鐩戞帶鍙婅繍缁寸鐞�', 'index');
+insert into sys_menu values('1074', 'ISIM Cloud', '1061', '13','#', '', '', '', 0, 0, 'C', '0', '0', 'system:index:isim', '#', 'admin', sysdate(), '', null, 'ISIM Cloud', 'index');
alter table sys_menu add column mark varchar(20) comment '鑿滃崟鏍囪瘑';
update sys_menu set mark = 'sys' where menu_id < 1070;
diff --git a/se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java b/se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java
index a489758..7228635 100644
--- a/se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java
+++ b/se-modules/se-system/src/main/java/com/se/system/mapper/SysMenuMapper.java
@@ -55,7 +55,7 @@
*
* @return 鑿滃崟鍒楄〃
*/
- public List<SysMenu> selectMenuTreeAll();
+ public List<SysMenu> selectMenuTreeAll(@Param("mark") String mark);
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鑿滃崟
diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
index 25c4524..9a8050e 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
+++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
@@ -117,16 +117,14 @@
*/
@Override
public List<SysMenu> selectMenuTreeByUserId(Long userId, String mark) {
- /*List<SysMenu> menus = null;
- if (SecurityUtils.isAdmin(userId))
- {
- menus = menuMapper.selectMenuTreeAll();
+ List<SysMenu> menus = null;
+ if (SecurityUtils.isAdmin(userId)) {
+ menus = menuMapper.selectMenuTreeAll(mark);
+ } else {
+ //menus = menuMapper.selectMenuTreeByUserId(userId, mark);
+ menus = menuMapper.selectMenuTreeByUserId(userId, mark);
}
- else
- {
- menus = menuMapper.selectMenuTreeByUserId(userId);
- }*/
- List<SysMenu> menus = menuMapper.selectMenuTreeByUserId(SecurityUtils.isAdmin(userId) ? null : userId, mark);
+ //List<SysMenu> menus = menuMapper.selectMenuTreeByUserId(SecurityUtils.isAdmin(userId) ? null : userId, mark);
return getChildPerms(menus, 0);
}
diff --git a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 92904e2..3fa509e 100644
--- a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -52,7 +52,11 @@
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, 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, m.mark
- from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
+ from sys_menu m
+ where m.menu_type in ('M', 'C') and m.status = 0
+ <if test="mark != null and mark != ''">
+ and m.mark = #{mark}
+ </if>
order by m.parent_id, m.order_num
</select>
--
Gitblit v1.9.3