diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java index d53d236ce..9ad65ce75 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java @@ -167,8 +167,8 @@ public class LoginController { * @date 2022/4/8 15:31 */ @GetResource(name = "新版Antdv3版本的用户信息获取", path = "/v3/userInfo", requiredPermission = false) - public ResponseData userInfoV3() { - return new SuccessResponseData<>(indexUserInfoService.userInfoV3()); + public ResponseData userInfoV3(Integer menuFrontType) { + return new SuccessResponseData<>(indexUserInfoService.userInfoV3(menuFrontType)); } } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java index f3e0443d8..d8c352f56 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java @@ -35,11 +35,12 @@ import cn.stylefeng.roses.kernel.system.api.pojo.login.v3.IndexUserInfoV3; public interface IndexUserInfoService { /** - * 获取用户头像的url + * 获取用户信息(新版Antdv3版本) * + * @param menuFrontType 菜单类型:前台菜单还是后台菜单 * @author fengshuonan - * @date 2020/12/27 19:13 + * @date 2022/4/8 15:31 */ - IndexUserInfoV3 userInfoV3(); + IndexUserInfoV3 userInfoV3(Integer menuFrontType); } 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 485e445d9..55e48a9ff 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 @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo; @@ -57,7 +58,7 @@ public class IndexUserInfoServiceImpl implements IndexUserInfoService { private MenuServiceApi menuServiceApi; @Override - public IndexUserInfoV3 userInfoV3() { + public IndexUserInfoV3 userInfoV3(Integer menuFrontType) { // 获取当前登录用户 LoginUser loginUser = LoginContext.me().getLoginUser(); @@ -106,7 +107,10 @@ public class IndexUserInfoServiceImpl implements IndexUserInfoService { indexUserInfoV3.setRoles(buildRoles(loginUser)); // 获取用户菜单和权限信息 - indexUserInfoV3.setAuthorities(menuServiceApi.buildAuthorities(MenuFrontTypeEnum.FRONT.getCode())); + if (ObjectUtil.isEmpty(menuFrontType)) { + menuFrontType = MenuFrontTypeEnum.FRONT.getCode(); + } + indexUserInfoV3.setAuthorities(menuServiceApi.buildAuthorities(menuFrontType)); // 登录人的ws-url indexUserInfoV3.setWsUrl(loginUser.getWsUrl());