From 1af33de1502e4cc466442c38375ef6c547ebbe06 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 17 Apr 2023 18:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.4.0=E3=80=91=E3=80=90org=E3=80=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/SysUserOrgServiceServiceImpl.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 e3bd42cd3..ea20dd2fb 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
@@ -210,12 +210,17 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
         List<SysUserOrg> sysUserOrgList = this.findList(userOrgResponse);
         for (SysUserOrg sysUserOrg : sysUserOrgList) {
 
-            if (sysUserOrg.getOrgId().equals(currentCompanyInfo.getOrgId())) {
+            // 公司id已经添加到列表中，不用再继续添加
+            if (currentCompanyInfo.getOrgId().equals(sysUserOrg.getOrgId())) {
                 continue;
             }
 
             // 获取用户的公司信息
             HrOrganizationDTO companyInfo = organizationServiceApi.getOrgCompanyInfo(sysUserOrg.getOrgId());
+            if (currentCompanyInfo.getOrgId().equals(companyInfo.getOrgId())) {
+                continue;
+            }
+
             results.add(companyInfo);
         }