From e20e226462793a1af136a7ad97282093d49b71c4 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 14 Jun 2023 10:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/system/api/pojo/login/v3/IndexUserInfoV3.java | 6 ++++++
 .../user/service/impl/IndexUserInfoServiceImpl.java      | 9 +++++++++
 2 files changed, 15 insertions(+)

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 fdcf07f8b..fa77821d2 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
@@ -101,6 +101,12 @@ public class IndexUserInfoV3 {
     @ChineseDescription("组织机构id")
     private Long organizationId;
 
+    /**
+     * 用户所属公司id
+     */
+    @ChineseDescription("用户所属公司id")
+    private Long companyId;
+
     /**
      * 用户状态
      */
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 cfe218419..294692513 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
@@ -31,9 +31,11 @@ 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.OrganizationServiceApi;
 import cn.stylefeng.roses.kernel.system.api.enums.AntdvFrontTypeEnum;
 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.api.pojo.organization.HrOrganizationDTO;
 import cn.stylefeng.roses.kernel.system.modular.user.service.IndexUserInfoService;
 import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService;
 import org.springframework.stereotype.Service;
@@ -57,6 +59,9 @@ public class IndexUserInfoServiceImpl implements IndexUserInfoService {
     @Resource
     private MenuServiceApi menuServiceApi;
 
+    @Resource
+    private OrganizationServiceApi organizationServiceApi;
+
     @Override
     public IndexUserInfoV3 userInfoV3(Integer menuFrontType, Boolean devopsFlag) {
 
@@ -96,6 +101,10 @@ public class IndexUserInfoServiceImpl implements IndexUserInfoService {
 
         // 设置组织机构id
         indexUserInfoV3.setOrganizationId(loginUser.getOrganizationId());
+        HrOrganizationDTO orgCompanyInfo = organizationServiceApi.getOrgCompanyInfo(loginUser.getOrganizationId());
+        if (orgCompanyInfo != null) {
+            indexUserInfoV3.setCompanyId(orgCompanyInfo.getOrgId());
+        }
 
         // 设置状态（暂时不设置）
         indexUserInfoV3.setStatus(null);