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 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); }