From 30a2349b7eeffc8e8f0de37c659927d40f891699 Mon Sep 17 00:00:00 2001
From: cheney <1251790704@qq.com>
Date: Tue, 26 Dec 2023 17:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8F=97=E9=82=80=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=AF=A5=E5=B9=B3=E5=8F=B0=E7=BB=84=E7=BB=87=EF=BC=8C?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=B7=B2=E5=9C=A8=E5=85=B6=E4=BB=96=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E5=AD=98=E5=9C=A8=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/huoran/common/exception/ExceptionEnum.java |  2 ++
 .../impl/PlatformTeamAccountServiceImpl.java       | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/huoran/common/exception/ExceptionEnum.java b/common/src/main/java/com/huoran/common/exception/ExceptionEnum.java
index 250693a..5e58d0f 100644
--- a/common/src/main/java/com/huoran/common/exception/ExceptionEnum.java
+++ b/common/src/main/java/com/huoran/common/exception/ExceptionEnum.java
@@ -60,6 +60,8 @@ public enum ExceptionEnum {
     DATA_PLATFORM_ACCOUNT_AVALIABLE_FAIL(10022, "当前用户所在的院校在数据平台的可用账号数量不足，是否继续！"),
     INVITATION_CODE_EXPIRED(10023, "邀请码已失效"),
     USER_ALREADY_EXISTS_GROUP(10024, "用户已存在该组织"),
+
+    USER_ALREADY_EXISTS_OTHER_GROUP(10024, "无法受邀加入该平台组织，账号已在其他平台存在组织信息！"),
     CANT_JOIN_TEAM(10025, "无法加入自己的团队"),
     CANNOT_ADDED_REPEATEDLY(10026, "该用户已经是团队管理员，无法重复添加！"),
     DEFAULT_ROLE_NOTEXIST(10027, "默认角色不存在"),
diff --git a/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java b/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java
index 57bb3c2..4a8d4b9 100644
--- a/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java
+++ b/nakadai/src/main/java/com/huoran/nakadai/service/impl/PlatformTeamAccountServiceImpl.java
@@ -328,9 +328,21 @@ public class PlatformTeamAccountServiceImpl extends ServiceImpl<PlatformTeamAcco
         }
         //验证手机验证码
         if (inviteJoinInfo.getCode().equals(value)) {
+            if (inviteJoinInfo.getPlatformId()==5){
+                // 查询邀请用户其他平台是否存在账号
+                UserAccount userAccount = baseMapper.selectAccount(inviteJoinInfo.getPhone(),"6");
+                if (userAccount != null) {
+                    throw new CustomException(ExceptionEnum.USER_ALREADY_EXISTS_OTHER_GROUP);
+                }
+            }else {
+                UserAccount userAccount = baseMapper.selectAccount(inviteJoinInfo.getPhone(),"5");
+                if (userAccount != null) {
+                    throw new CustomException(ExceptionEnum.USER_ALREADY_EXISTS_OTHER_GROUP);
+                }
+            }
 
             //查询邀请用户是否存在账号
-            UserAccount userAccount = baseMapper.selectAccount(inviteJoinInfo.getPlatformId().toString(), inviteJoinInfo.getPhone());
+            UserAccount userAccount = baseMapper.selectAccount(inviteJoinInfo.getPhone(),inviteJoinInfo.getPlatformId().toString());
 
             Integer manageId ;
             //邀请人为成员且账号存在，则直接拉入该团队，不可重复拉入