From 07a63e82521b294261abe2de3d5828e0958e2cc3 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 10 Jul 2023 14:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90portal=E3=80=91=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=A4=96=E9=83=A8=E4=B8=BB?=
 =?UTF-8?q?=E9=94=AEid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/auth/api/pojo/login/LoginUser.java |  6 ++++++
 .../system/api/pojo/login/v3/IndexUserInfoV3.java   |  6 ++++++
 .../modular/user/factory/UserLoginInfoFactory.java  | 13 ++++++-------
 .../user/service/impl/IndexUserInfoServiceImpl.java |  3 +++
 4 files changed, 21 insertions(+), 7 deletions(-)

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<String> 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<SysRoleDTO> roleResponseList,
-                                                    DataScopeDTO dataScopeResponse,
-                                                    SysUserOrgDTO userOrgInfo,
-                                                    Set<String> resourceUrlsListByCodes,
-                                                    Set<String> roleButtonCodes,
-                                                    AntdvFrontTypeEnum userMenuType) {
+    public static UserLoginInfoDTO userLoginInfoDTO(SysUser sysUser, List<SysRoleDTO> roleResponseList, DataScopeDTO dataScopeResponse,
+                                                    SysUserOrgDTO userOrgInfo, Set<String> resourceUrlsListByCodes,
+                                                    Set<String> 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;
     }