From d6c0f2ed698d6cdf86a0a3a8893b4d9717f3b7b1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 五月 2026 14:51:54 +0800
Subject: [PATCH] Merge branch '1.0' 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 | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 ac86d89..fa18750 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
@@ -9,6 +9,7 @@
import com.xiaopeng.account.model.query.SysUserListQuery;
import com.xiaopeng.account.service.*;
import com.xiaopeng.api.model.account.*;
+import com.xiaopeng.api.vo.account.LoginUser;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.enums.DisabledEnum;
import com.xiaopeng.common.core.exception.ServiceException;
@@ -82,11 +83,14 @@
@GetMapping("/api/v1/sys-user/pageList")
@ApiOperation(value = "账号管理分页列表", tags = {"管理后台-账号管理"})
public AjaxResult<PageInfo<SysUser>> list(final SysUserListQuery sysUserListQuery) {
+ LoginUser loginUser = tokenService.getLoginUser();
PageInfo<SysUser> pageInfo = new PageInfo<SysUser>(sysUserListQuery.getPageNum(), sysUserListQuery.getPageSize());
PageInfo<SysUser> page = userService.getList(pageInfo, sysUserListQuery);
page.getRecords().forEach(user -> {
- user.setPhoneNumber(sysGroupService.getPhoneDesensitization(user.getPhoneNumber()));
+ if(!loginUser.getPhoneDesensitization()){
+ user.setPhoneNumber(DesensitizedUtil.mobilePhone(user.getPhoneNumber()));
// user.setUserAccount(sysGroupService.getPhoneDesensitization(user.getUserAccount()));
+ }
});
return AjaxResult.success(page);
}
@@ -96,8 +100,13 @@
@GetMapping("/api/v1/sys-user/listAll")
@ApiOperation(value = "账号管理不分页列表", tags = {"管理后台-账号管理"})
public R<List<SysUser>> listAll() {
+ LoginUser loginUser = tokenService.getLoginUser();
List<SysUser> listAll = userService.list();
- listAll.forEach(user -> user.setPhoneNumber(sysGroupService.getPhoneDesensitization(user.getPhoneNumber())));
+ for (SysUser sysUser : listAll) {
+ if(!loginUser.getPhoneDesensitization()){
+ sysUser.setPhoneNumber(DesensitizedUtil.mobilePhone(sysUser.getPhoneNumber()));
+ }
+ }
return R.ok(listAll);
}
@@ -180,6 +189,7 @@
@ApiOperation(value = "获取用户详情", tags = {"管理后台-系统用户管理"})
@GetMapping("/api/v1/getInfo/{userId}")
public AjaxResult getInfo(@PathVariable Long userId) {
+ LoginUser loginUser = tokenService.getLoginUser();
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = sysRoleService.list();
@@ -187,7 +197,9 @@
ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId)) {
SysUser sysUser = userService.selectUserById(userId);
- sysUser.setPhoneNumber(sysGroupService.getPhoneDesensitization(sysUser.getPhoneNumber()));
+ if(!loginUser.getPhoneDesensitization()){
+ sysUser.setPhoneNumber(DesensitizedUtil.mobilePhone(sysUser.getPhoneNumber()));
+ }
ajax.put(AjaxResult.DATA_TAG, sysUser);
ajax.put("postIds", postService.selectPostListByUserId(userId));
// ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getId).collect(Collectors.toList()));
--
Gitblit v1.7.1