From 842c0755fdf8501b85f02ecacd71ee4e2b6b9327 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 五月 2026 13:32:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
index 6f9750f..09c4579 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
@@ -48,6 +48,9 @@
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
/**
* 用户信息
@@ -235,12 +238,9 @@
public AjaxResult edit(@Validated @RequestBody SysUser user) {
userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getId());
- SysUser sysUser = null;
- if (StringUtils.isNotEmpty(user.getPhoneNumber())) {
- sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
- .in(SysUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(user.getPhoneNumber()))
- .last("LIMIT 1"));
- }
+ SysUser sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
+ .in(SysUser::getPhoneNumber, SensitiveDataCryptoUtil.queryValues(user.getPhoneNumber()))
+ .last("LIMIT 1"));
if (StringUtils.isNotEmpty(user.getPhoneNumber()) && (Objects.nonNull(sysUser) && !user.getId().equals(sysUser.getId()) )) {
throw new ServiceException("手机号已开通账号", I18nKeyConstant.ACCOUNT_PHONE_DUPLICATE);
@@ -479,8 +479,7 @@
return R.ok(java.util.Collections.emptyList());
}
List<SysUser> list = userService.list(Wrappers.lambdaQuery(SysUser.class)
- .in(SysUser::getPhoneNumber, phoneQueryValues));
- list.forEach(user -> user.setPhoneNumber(SensitiveDataCryptoUtil.decryptIfPossible(user.getPhoneNumber())));
+ .in(SysUser::getPhoneNumber, buildPhoneQueryValues(phoneList)));
return R.ok(list);
}
@@ -504,6 +503,17 @@
return R.ok(user);
}
+ private List<String> buildPhoneQueryValues(List<String> phoneList) {
+ if (phoneList == null) {
+ return java.util.Collections.emptyList();
+ }
+ return phoneList.stream()
+ .filter(StringUtils::isNotBlank)
+ .flatMap(phone -> SensitiveDataCryptoUtil.queryValues(phone).stream())
+ .distinct()
+ .collect(Collectors.toList());
+ }
+
/**
* 通过账号查询用户
--
Gitblit v1.7.1