From ab1a0860feaa60095ddfa77d9543dffd2310cb4a Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 14 Jun 2023 10:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=AC=E5=8F=B8=E7=9A=84=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysUserOrgServiceServiceImpl.java    | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
index d5ab8d7ab..b7904d5c2 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
@@ -226,35 +226,16 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
 
         LoginUser loginUser = LoginContext.me().getLoginUser();
 
-        // 获取当前登录用户的组织机构id，放在第一位
-        Long currentOrgId = loginUser.getOrganizationId();
-
-        // 获取当前用户orgId的公司信息
-        HrOrganizationDTO currentCompanyInfo = organizationServiceApi.getOrgCompanyInfo(currentOrgId);
-        if (currentCompanyInfo != null) {
-            results.add(currentCompanyInfo);
-        }
-
         // 获取当前用户绑定的组织机构列表
         UserOrgRequest userOrgResponse = new UserOrgRequest();
         userOrgResponse.setUserId(loginUser.getUserId());
         List<SysUserOrg> sysUserOrgList = this.findList(userOrgResponse);
         for (SysUserOrg sysUserOrg : sysUserOrgList) {
-
-            // 公司id已经添加到列表中，不用再继续添加
-            if (currentCompanyInfo.getOrgId().equals(sysUserOrg.getOrgId())) {
-                continue;
-            }
-
             // 获取用户的公司信息
             HrOrganizationDTO companyInfo = organizationServiceApi.getOrgCompanyInfo(sysUserOrg.getOrgId());
             if (companyInfo == null) {
                 continue;
             }
-            if (currentCompanyInfo.getOrgId().equals(companyInfo.getOrgId())) {
-                continue;
-            }
-
             results.add(companyInfo);
         }