diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java index 36e4ea8ad..cc0bcf7d4 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java @@ -180,6 +180,12 @@ public class LoginUser implements Serializable { @ChineseDescription("用户拥有的菜单类型:1-前台 ,2-后台,3-所有") private Integer menuType; + /** + * 主数据的用户id + */ + @ChineseDescription("主数据的用户id") + private String masterUserId; + public String getWsUrl() { if (ObjectUtil.isEmpty(this.wsUrl)) { return ""; diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/login/v3/IndexUserInfoV3.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/login/v3/IndexUserInfoV3.java index fa77821d2..1d8a03f81 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/login/v3/IndexUserInfoV3.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/login/v3/IndexUserInfoV3.java @@ -149,4 +149,10 @@ public class IndexUserInfoV3 { @ChineseDescription("权限标识编码") private Set authCodes; + /** + * 主数据的用户id + */ + @ChineseDescription("主数据的用户id") + private String masterUserId; + } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java index 8f1673bf4..660d47eb0 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java @@ -64,13 +64,9 @@ public class UserLoginInfoFactory { * @author fengshuonan * @since 2020/12/26 17:53 */ - public static UserLoginInfoDTO userLoginInfoDTO(SysUser sysUser, - List roleResponseList, - DataScopeDTO dataScopeResponse, - SysUserOrgDTO userOrgInfo, - Set resourceUrlsListByCodes, - Set roleButtonCodes, - AntdvFrontTypeEnum userMenuType) { + public static UserLoginInfoDTO userLoginInfoDTO(SysUser sysUser, List roleResponseList, DataScopeDTO dataScopeResponse, + SysUserOrgDTO userOrgInfo, Set resourceUrlsListByCodes, + Set roleButtonCodes, AntdvFrontTypeEnum userMenuType) { UserLoginInfoDTO userLoginInfoDTO = new UserLoginInfoDTO(); @@ -135,6 +131,9 @@ public class UserLoginInfoFactory { // 设置登录用户的菜单类型 loginUser.setMenuType(userMenuType.getCode()); + // 设置外部用户id + loginUser.setMasterUserId(sysUser.getMasterUserId()); + // 响应dto userLoginInfoDTO.setLoginUser(loginUser); return userLoginInfoDTO; diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java index 294692513..e002ae725 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java @@ -130,6 +130,9 @@ public class IndexUserInfoServiceImpl implements IndexUserInfoService { // 权限编码 indexUserInfoV3.setAuthCodes(loginUser.getButtonCodes()); + // 设置外部id + indexUserInfoV3.setMasterUserId(loginUser.getMasterUserId()); + return indexUserInfoV3; }