From 1ca66b10db05e7c9d5d653361d334f161b452c23 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 07 三月 2026 21:01:58 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java | 9 ++++++++-
1 files changed, 8 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 35bc854..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
@@ -114,6 +114,9 @@
@ApiOperation(value = "编辑白名单")
@Transactional
public R edit(@Validated @RequestBody WhitelistEditDto dto) {
+ if (!StringUtils.hasLength(dto.getAccount())) {
+ return R.fail("请输入账号");
+ }
SysUser sysUser = tokenService.getLoginUser().getSysUser();
XpWhitelist xpWhitelist = new XpWhitelist();
BeanUtils.copyProperties(dto, xpWhitelist);
@@ -224,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