diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/MenuServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/MenuServiceApi.java index 3377efdf3..ea48225b6 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/MenuServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/MenuServiceApi.java @@ -84,9 +84,10 @@ public interface MenuServiceApi { /** * 构建Antdv3版本的菜单和权限信息 * + * @param menuFrontType 菜单的前后台类型,如果没传递,默认查前台菜单 * @author fengshuonan * @date 2022/4/8 15:59 */ - List buildAuthorities(); + List buildAuthorities(Integer menuFrontType); } diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java index a8bc33663..07e760c44 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java @@ -588,10 +588,10 @@ public class SysMenuServiceImpl extends ServiceImpl impl } @Override - public List buildAuthorities() { + public List buildAuthorities(Integer menuFrontType) { // 不分离应用查询菜单 - List currentUserMenus = this.getCurrentUserMenus(null, false, null); + List currentUserMenus = this.getCurrentUserMenus(null, false, menuFrontType); // 获取当前激活的应用 List sortedApps = appServiceApi.getSortedApps(); diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java index 25f069fc8..485e445d9 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java @@ -30,6 +30,7 @@ import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo; import cn.stylefeng.roses.kernel.rule.enums.SexEnum; import cn.stylefeng.roses.kernel.system.api.MenuServiceApi; +import cn.stylefeng.roses.kernel.system.api.enums.MenuFrontTypeEnum; import cn.stylefeng.roses.kernel.system.api.pojo.login.v3.IndexRoleInfo; import cn.stylefeng.roses.kernel.system.api.pojo.login.v3.IndexUserInfoV3; import cn.stylefeng.roses.kernel.system.modular.user.service.IndexUserInfoService; @@ -105,7 +106,7 @@ public class IndexUserInfoServiceImpl implements IndexUserInfoService { indexUserInfoV3.setRoles(buildRoles(loginUser)); // 获取用户菜单和权限信息 - indexUserInfoV3.setAuthorities(menuServiceApi.buildAuthorities()); + indexUserInfoV3.setAuthorities(menuServiceApi.buildAuthorities(MenuFrontTypeEnum.FRONT.getCode())); // 登录人的ws-url indexUserInfoV3.setWsUrl(loginUser.getWsUrl());