From 9221e55752d02321cc6ee3b90b760cb44bc8d090 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 21 Jun 2022 11:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC=E7=94=A8=E6=88=B7=E5=B7=B2?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BB=93=E5=BA=93=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E9=A1=B9=E7=9B=AE=E7=94=B3=E8=AF=B7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=8F=AA=E5=88=9B=E5=BB=BA=E4=B8=80=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects/project_invite_links_controller.rb | 2 +- app/services/projects/link_join_service.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects/project_invite_links_controller.rb b/app/controllers/projects/project_invite_links_controller.rb index 14bdc959f..ddf88e6bf 100644 --- a/app/controllers/projects/project_invite_links_controller.rb +++ b/app/controllers/projects/project_invite_links_controller.rb @@ -31,7 +31,7 @@ class Projects::ProjectInviteLinksController < Projects::BaseController render_ok rescue Exception => e uid_logger_error(e.message) - tip_exception(e.message) + normal_status(-1, e.message) end diff --git a/app/services/projects/link_join_service.rb b/app/services/projects/link_join_service.rb index e586933f9..682fd1414 100644 --- a/app/services/projects/link_join_service.rb +++ b/app/services/projects/link_join_service.rb @@ -28,11 +28,11 @@ class Projects::LinkJoinService < ApplicationService raise Error, 'invite_sign必须存在!' if invite_sign.blank? raise Error, '邀请链接不存在!' unless invite_link.present? raise Error, '邀请链接已失效!' unless invite_user_in_project - raise Error, '用户已加入该项目!' if project.member?(user.id) + raise Error, '您已是仓库成员' if project.member?(user.id) end def create_applied_project! - user.applied_projects.create!(project: project, role: role_value, project_invite_link_id: invite_link&.id) + user.applied_projects.find_or_create_by!(status: 'common', project: project, role: role_value, project_invite_link_id: invite_link&.id) end def create_member!