From 751d75b51a19c521364af730f5d6ea95fc25c871 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 三月 2026 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 7aed918..f9ff11f 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
@@ -242,7 +242,7 @@
recordFail(reasonCountMap, reasonSampleMap, "账号为空", "第" + excelRowNumber + "行", sampleLimitPerReason);
continue;
}
- if (!PhoneUtil.isPhone(account)) {
+ if (!PhoneUtil.isMobile(account)) {
recordFail(reasonCountMap, reasonSampleMap, "账号格式不正确", account, sampleLimitPerReason);
continue;
}
@@ -406,9 +406,10 @@
public void exportExcel(@RequestBody WhitelistPageListQuery query) {
List<XpWhitelist> exportList = xpWhitelistService.exportList(query);
List<XpWhitelistExportExcel> xpWhitelistExportExcels = new ArrayList<>();
+ long sequence = 1L;
for (XpWhitelist xpWhitelist : exportList) {
XpWhitelistExportExcel xpWhitelistExportExcel = new XpWhitelistExportExcel();
- xpWhitelistExportExcel.setId(xpWhitelist.getId());
+ xpWhitelistExportExcel.setId(sequence++);
xpWhitelistExportExcel.setAccount(xpWhitelist.getAccount());
xpWhitelistExportExcel.setNickName(xpWhitelist.getNickName());
xpWhitelistExportExcel.setStatus(xpWhitelist.getStatus());
--
Gitblit v1.7.1