From 4923456b6d61f082f027da513e4ef27bbfee6e46 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 30 Jan 2024 18:39:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E4=B8=AD=E7=94=A8=E6=88=B7=E6=89=80=E5=B1=9E=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1034814 --user=宋天阳 【系统-】用户加入多个组织用户组，在系统用户列表中组织展示多个相同的组织 https://www.tapd.cn/55049933/s/1456320
---
 .../io/metersphere/system/service/UserRoleRelationService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java
index fe1adf3b58..aacdbc53c3 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java
@@ -184,7 +184,7 @@ public class UserRoleRelationService {
                 userInfo.getUserRoleList().add(userRole);
             }
             Organization organization = organizationMap.get(userRoleRelation.getSourceId());
-            if (organization != null) {
+            if (organization != null && !userInfo.getOrganizationList().contains(organization)) {
                 userInfo.getOrganizationList().add(organization);
             }
         }