From f192125973061632aa2c6fd66b62b87540b8490e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 28 二月 2026 16:48:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
index 183220f..082ceb8 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpOperationsUserServiceImpl.java
@@ -213,6 +213,10 @@
Map<Long, List<SysRole>> map = new HashMap<>();
for (XpOperationsRole xpOperationsRole : xpOperationsRoles) {
List<SysRole> sysRoleList = sysRoles.stream().filter(sysRole -> sysRole.getId().equals(xpOperationsRole.getRoleId())).collect(Collectors.toList());
+ List<SysRole> roleList = map.get(xpOperationsRole.getOperationsUserId());
+ if(!CollectionUtils.isEmpty(roleList)){
+ sysRoleList.addAll(roleList);
+ }
map.put(xpOperationsRole.getOperationsUserId(), sysRoleList);
}
// 角色名称匹配
--
Gitblit v1.7.1