From 423d5a9316543ce4f0480eebcb375774d3b080e5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 1 Nov 2022 15:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9D=83=E9=99=90=E5=88=B0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=97=B6=E9=9C=80=E9=A2=84=E5=85=88=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E4=BA=8E=E5=9B=A2=E9=98=9F=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/concerns/project_operable.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/project_operable.rb b/app/models/concerns/project_operable.rb index bdce2fda2..10b03cf72 100644 --- a/app/models/concerns/project_operable.rb +++ b/app/models/concerns/project_operable.rb @@ -130,7 +130,7 @@ module ProjectOperable team_user = member.team_user $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的 $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的 - team_user.update_attributes!({team_id: team.id}) + team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id) # 确保组织成员中有该用户 OrganizationUser.build(self.user_id, user_id) @@ -150,7 +150,7 @@ module ProjectOperable team_user = member.team_user $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的 $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的 - team_user.update_attributes!({team_id: team.id}) + team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id) OrganizationUser.build(self.user_id, user_id) when 'Reporter' @@ -170,7 +170,7 @@ module ProjectOperable team_user = member.team_user $gitea_client.delete_teams_members_by_id_username(team_user.team.gtid, team_user.user&.login) rescue nil # 移除旧的 $gitea_client.put_teams_members_by_id_username(team&.gtid, team_user.user&.login) rescue nil # 新增新的 - team_user.update_attributes!({team_id: team.id}) + team_user.update_attributes!({team_id: team.id}) unless team.team_users.exists?(user_id: member.user_id) # 确保组织成员中有该用户 OrganizationUser.build(self.user_id, user_id)