From f7675bda569bf0654b4157613c8ba448ac43c5a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 三月 2026 17:11:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
index 4f3d762..9afc46e 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
@@ -227,7 +227,11 @@
return AjaxResult.error("白名单手机号存在重复!");
}
Map<String, Long> codeMap = xpWhitelistService.list().stream()
- .collect(Collectors.toMap(XpWhitelist::getAccount, XpWhitelist::getId));
+ .collect(Collectors.toMap(
+ XpWhitelist::getAccount,
+ XpWhitelist::getId,
+ (existing, replacement) -> replacement // 如果冲突，用新的覆盖
+ ));
JSONObject result = new JSONObject();
List<XpWhitelist> addList = new ArrayList<>();
for (WhitelistImportExcel whitelistImportExcel : whitelistImportExcels) {
--
Gitblit v1.7.1