From 08d83509bdaee8785803b77a8237a93d81f9b9c0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 八月 2024 11:01:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ac35013..247bbe3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -593,6 +593,7 @@
data1.addAll(data);
}
Set<Integer> siteIds = new HashSet<>(data1);
+ sysUser.setSiteIds(siteIds.stream().collect(Collectors.toList()));
List<Site> data = siteClient.getSiteByIds(siteIds.stream().collect(Collectors.toList())).getData();
if(null != data){
List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());
@@ -603,6 +604,8 @@
SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId());
roleNames.add(sysRole.getRoleName());
}
+ Long[] roleIds = new Long[]{};
+ sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds));
sysUser.setRoleNames(roleNames);
}
return pageInfo.setRecords(list);
--
Gitblit v1.7.1