From 4220428f92c53eeda2ca8311f42b7284138decf3 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Wed, 2 Jul 2025 14:47:17 +0800 Subject: [PATCH] fel --- .../common/core/constant/TenantConstants.java | 5 +++++ .../controller/system/SysMenuController.java | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/TenantConstants.java b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/TenantConstants.java index c51e256..43839b2 100644 --- a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/TenantConstants.java +++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/TenantConstants.java @@ -22,6 +22,11 @@ public interface TenantConstants { */ String TENANT_ADMIN_ROLE_KEY = "admin"; + /** + * 富源晟内部员工 roleKey + */ + String FYS_ROLE_KEY = "fel"; + /** * 租户管理员角色名称 */ diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java index 3b705f8..9f2a0d6 100644 --- a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java @@ -51,8 +51,9 @@ public class SysMenuController extends BaseController { * 获取菜单列表 */ @SaCheckRole(value = { - TenantConstants.SUPER_ADMIN_ROLE_KEY, - TenantConstants.TENANT_ADMIN_ROLE_KEY + TenantConstants.SUPER_ADMIN_ROLE_KEY, + TenantConstants.TENANT_ADMIN_ROLE_KEY, + TenantConstants.FYS_ROLE_KEY }, mode = SaMode.OR) @SaCheckPermission("system:menu:list") @GetMapping("/list") @@ -67,8 +68,9 @@ public class SysMenuController extends BaseController { * @param menuId 菜单ID */ @SaCheckRole(value = { - TenantConstants.SUPER_ADMIN_ROLE_KEY, - TenantConstants.TENANT_ADMIN_ROLE_KEY + TenantConstants.SUPER_ADMIN_ROLE_KEY, + TenantConstants.TENANT_ADMIN_ROLE_KEY, + TenantConstants.FYS_ROLE_KEY }, mode = SaMode.OR) @SaCheckPermission("system:menu:query") @GetMapping(value = "/{menuId}") @@ -96,8 +98,8 @@ public class SysMenuController extends BaseController { public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { List menus = menuService.selectMenuList(LoginHelper.getUserId()); MenuTreeSelectVo selectVo = new MenuTreeSelectVo( - menuService.selectMenuListByRoleId(roleId), - menuService.buildMenuTreeSelect(menus)); + menuService.selectMenuListByRoleId(roleId), + menuService.buildMenuTreeSelect(menus)); return R.ok(selectVo); } @@ -112,8 +114,8 @@ public class SysMenuController extends BaseController { public R tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) { List menus = menuService.selectMenuList(LoginHelper.getUserId()); MenuTreeSelectVo selectVo = new MenuTreeSelectVo( - menuService.selectMenuListByPackageId(packageId), - menuService.buildMenuTreeSelect(menus)); + menuService.selectMenuListByPackageId(packageId), + menuService.buildMenuTreeSelect(menus)); return R.ok(selectVo); }