From 2bfa3feedaac0ca3a3c0293c7fe74d5693fdb870 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 18 Apr 2023 10:47:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.4.0=E3=80=91=E3=80=90org=E3=80=91?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E5=85=AC=E5=8F=B8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/system/api/UserOrgServiceApi.java  | 10 +++++++
 .../impl/SysUserOrgServiceServiceImpl.java    | 26 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java
index 2b6fb9721..6690e84c9 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java
@@ -24,6 +24,7 @@
  */
 package cn.stylefeng.roses.kernel.system.api;
 
+import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO;
 import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO;
 
 import java.util.Set;
@@ -60,4 +61,13 @@ public interface UserOrgServiceApi {
      * @since 2020/12/19 22:33
      */
     Set<Long> getUserIdsByOrgIds(Set<Long> organizationIds);
+
+    /**
+     * 获取当前登录用户的公司id
+     *
+     * @author fengshuonan
+     * @since 2023/4/18 10:36
+     */
+    HrOrganizationDTO getUserCompany(Long userId);
+
 }
diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
index ea20dd2fb..42cd01776 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
@@ -96,6 +96,28 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
         return userOrgs.stream().map(SysUserOrg::getUserId).collect(Collectors.toSet());
     }
 
+    @Override
+    public HrOrganizationDTO getUserCompany(Long userId) {
+
+        LoginUser loginUserNullable = LoginContext.me().getLoginUserNullable();
+        if (loginUserNullable == null) {
+            return null;
+        }
+
+        // 获取当前用户的组织机构id
+        Long currentOrgId = loginUserNullable.getOrganizationId();
+        if (currentOrgId == null) {
+            return null;
+        }
+
+        // 获取当前用户orgId的公司信息
+        HrOrganizationDTO currentCompanyInfo = organizationServiceApi.getOrgCompanyInfo(currentOrgId);
+        if (currentCompanyInfo == null) {
+            return null;
+        }
+        return currentCompanyInfo;
+    }
+
 
     @Override
     public void add(UserOrgRequest userOrgResponse) {
@@ -202,7 +224,9 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
 
         // 获取当前用户orgId的公司信息
         HrOrganizationDTO currentCompanyInfo = organizationServiceApi.getOrgCompanyInfo(currentOrgId);
-        results.add(currentCompanyInfo);
+        if (currentCompanyInfo != null) {
+            results.add(currentCompanyInfo);
+        }
 
         // 获取当前用户绑定的组织机构列表
         UserOrgRequest userOrgResponse = new UserOrgRequest();