From 53a92b6d2803e63be09eb51d27e4b82b540ce3d2 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 15 Jun 2023 17:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90portal=E3=80=91=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=9C=BA=E6=9E=84id=E6=89=BE?=
 =?UTF-8?q?=E5=88=B0=E6=9C=AC=E7=B3=BB=E7=BB=9F=E5=85=AC=E5=8F=B8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/api/OrganizationServiceApi.java    |  8 ++++++
 .../impl/HrOrganizationServiceImpl.java       | 25 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java
index 941fbd79a..341d43342 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java
@@ -103,4 +103,12 @@ public interface OrganizationServiceApi {
      */
     HrOrganizationDTO getOrgCompanyInfo(Long orgId);
 
+    /**
+     * 获取第三方机构id，对应的本系统公司id
+     *
+     * @author fengshuonan
+     * @since 2023/6/15 17:05
+     */
+    Long getMasterOrgIdCompanyId(String masterOrgId);
+
 }
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
index dfab65810..a0d3dcfe5 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
@@ -519,6 +519,31 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         return getOrgCompanyInfo(orgDetail.getOrgParentId());
     }
 
+    @Override
+    public Long getMasterOrgIdCompanyId(String masterOrgId) {
+
+        // 获取第三方公司对应的本系统机构id
+        LambdaQueryWrapper<HrOrganization> hrOrganizationLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        hrOrganizationLambdaQueryWrapper.eq(HrOrganization::getMasterOrgId, masterOrgId);
+        hrOrganizationLambdaQueryWrapper.select(HrOrganization::getOrgId);
+        HrOrganization hrOrganization = this.getOne(hrOrganizationLambdaQueryWrapper, false);
+
+        if (hrOrganization == null) {
+            return null;
+        }
+
+        Long orgId = hrOrganization.getOrgId();
+
+        // 获取组织机构对应的公司id
+        HrOrganizationDTO companyInfo = this.getOrgCompanyInfo(orgId);
+
+        if (companyInfo == null) {
+            return null;
+        }
+
+        return companyInfo.getOrgId();
+    }
+
     @Override
     public HomeCompanyInfo getHomeCompanyInfo() {
         HomeCompanyInfo homeCompanyInfo = new HomeCompanyInfo();