From 3c0fa205d1e9b37e528386eddce0773216f7ea08 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Mon, 9 Dec 2024 18:17:09 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:code-create=E6=B3=A8=E5=86=8C=E7=9A=84?=
 =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=BAaida=E7=9A=84=E6=B8=B8=E5=AE=A2,=E5=8E=BB=E9=87=8Dbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/service/impl/AccountServiceImpl.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
index c0097b5c..3baf594a 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -1454,19 +1454,23 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
             queryWrapper.in("user_email", allEmail).select("user_email");
 
             // 重复的邮箱
-            List<String> collect = baseMapper.selectList(queryWrapper).stream().map(Account::getUserEmail).collect(Collectors.toList());
-            if (!collect.isEmpty()){
+            List<String> duplicateEmails = baseMapper.selectList(queryWrapper).stream().map(Account::getUserEmail).collect(Collectors.toList());
+            if (!duplicateEmails.isEmpty()){
                 // 移除Code-Create新增用户中在AiDA已有账号的邮箱，allEmail中剩余邮箱均为新用户邮箱
-                allEmail.removeAll(collect);
+                allEmail.removeIf(item -> duplicateEmails.stream()
+                        .anyMatch(removeItem -> removeItem.equalsIgnoreCase(item)));
                 if (!allEmail.isEmpty()){
-                    for (Map<String,String> userInfo : newUsersInfo){
+                    Iterator<Map<String, String>> iterator = newUsersInfo.iterator();
+                    while (iterator.hasNext()) {
+                        Map<String, String> userInfo = iterator.next();
                         String email = userInfo.get("email");
                         if (!allEmail.contains(email)) {
-                            newUsersInfo.remove(userInfo); // 移除不在 allEmail 中的用户
+                            iterator.remove(); // 使用迭代器安全地移除元素
                         }
                     }
+                }else {
+                    newUsersInfo.clear();
                 }
-
             }
             // 将新增用户添加到AiDA，身份为游客
             if (!newUsersInfo.isEmpty()){