aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/3.0' into release/3.0

Browse Source
This commit is contained in:
shahaibo
2024-12-13 10:35:17 +08:00
parent 11a5b53d2a 3c0fa205d1
commit e34cec812f
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -1454,19 +1454,23 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
queryWrapper.in("user_email", allEmail).select("user_email"); queryWrapper.in("user_email", allEmail).select("user_email");
// 重复的邮箱 // 重复的邮箱
List<String> collect = baseMapper.selectList(queryWrapper).stream().map(Account::getUserEmail).collect(Collectors.toList()); List<String> duplicateEmails = baseMapper.selectList(queryWrapper).stream().map(Account::getUserEmail).collect(Collectors.toList());
if (!collect.isEmpty()){ if (!duplicateEmails.isEmpty()){
// 移除Code-Create新增用户中在AiDA已有账号的邮箱，allEmail中剩余邮箱均为新用户邮箱 // 移除Code-Create新增用户中在AiDA已有账号的邮箱，allEmail中剩余邮箱均为新用户邮箱
allEmail.removeAll(collect); allEmail.removeIf(item -> duplicateEmails.stream()
.anyMatch(removeItem -> removeItem.equalsIgnoreCase(item)));
if (!allEmail.isEmpty()){ 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"); String email = userInfo.get("email");
if (!allEmail.contains(email)) { if (!allEmail.contains(email)) {
newUsersInfo.remove(userInfo); // 移除不在 allEmail 中的用户 iterator.remove(); // 使用迭代器安全地移除元素
} }
} }
}else {
newUsersInfo.clear();
} }
} }
// 将新增用户添加到AiDA，身份为游客 // 将新增用户添加到AiDA，身份为游客
if (!newUsersInfo.isEmpty()){ if (!newUsersInfo.isEmpty()){