From f33eaf279fdae3a5cae7775dc2a67e2d080dd5e0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 五月 2026 00:03:14 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
index 9b102c8..3bc1899 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpWhitelistServiceImpl.java
@@ -18,6 +18,7 @@
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.constant.I18nKeyConstant;
import com.xiaopeng.operation.dto.WhitelistAddDto;
+import com.xiaopeng.operation.dto.WhitelistEditDto;
import com.xiaopeng.operation.mapper.XpWhitelistMapper;
import com.xiaopeng.operation.mapper.XpWhitelistOperlogMapper;
import com.xiaopeng.operation.query.WhitelistPageListQuery;
@@ -274,7 +275,7 @@
}
@Override
- public R editWhitelist(XpWhitelist dto, SysUser sysUser) {
+ public R editWhitelist(WhitelistEditDto dto, SysUser sysUser) {
if (!PhoneUtil.isMobile(dto.getAccount())) {
throw new ServiceException("以下帐号格式不正确：", I18nKeyConstant.ACCOUNT_FORMAT_ERROR, new Object[]{dto.getAccount()});
}
@@ -288,7 +289,7 @@
}
XpWhitelist whitelist = this.getById(dto.getId());
whitelist.setAccount(SensitiveDataCryptoUtil.decryptIfPossible(whitelist.getAccount()));
-
+ whitelist.setNickName(userByAccount.getNickName());
whitelist.setAppUserId(userByAccount.getUid());
StringBuilder operationContent = new StringBuilder("编辑账号:");
@@ -332,6 +333,7 @@
StringBuilder content = operationContent.append(accountBuilder);
xpWhitelistOperlog.setOperationContent(content.toString());
xpWhitelistOperlogMapper.insert(xpWhitelistOperlog);
+
whitelist.setNickName(dto.getNickName());
whitelist.setIsPriorityDispatch(dto.getIsPriorityDispatch());
whitelist.setAccount(SensitiveDataCryptoUtil.encrypt(dto.getAccount()));
--
Gitblit v1.7.1