From 856e01ca04d1cc88f4efe560426e97cbd9f7f489 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 28 二月 2026 14:06:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 d327b92..70a749c 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
@@ -117,6 +117,8 @@
SysUser sysUser = tokenService.getLoginUser().getSysUser();
XpWhitelist xpWhitelist = new XpWhitelist();
BeanUtils.copyProperties(dto, xpWhitelist);
+ xpWhitelist.setUpdateBy(tokenService.getLoginUser().getSysUser().getNickName());
+
return xpWhitelistService.editWhitelist(xpWhitelist, sysUser);
}
@@ -190,6 +192,7 @@
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
@PostMapping("/importExcel")
public AjaxResult<String> importExcel(@RequestPart("file") MultipartFile file) {
+
ImportParams params = new ImportParams();
// params.setTitleRows(1); // 标题行数
params.setHeadRows(1); //表头行数
@@ -235,6 +238,7 @@
xpWhitelist.setStatus(true);
xpWhitelist.setIsPriorityDispatch(true);
xpWhitelist.setWhitelistSource(1);
+ xpWhitelist.setCreateBy(tokenService.getLoginUser().getSysUser().getNickName());
addList.add(xpWhitelist);
}
if (!result.isEmpty()) {
@@ -250,6 +254,7 @@
xpWhitelistOperlog.setOperationIp(IpUtils.getIpAddr());
xpWhitelistOperlog.setOperationAccountId(sysUser.getId());
xpWhitelistOperlog.setOperationContent(operationContent.toString());
+ xpWhitelistOperlog.setCreateBy(tokenService.getLoginUser().getSysUser().getNickName());
xpWhitelistOperlogService.save(xpWhitelistOperlog);
return AjaxResult.success();
}
--
Gitblit v1.7.1