From e125d529c1c3748bcf15c619576b2c9e1cc69d54 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 18 十月 2024 18:21:08 +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 | 2 +-
1 files changed, 1 insertions(+), 1 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 766820b..16f9f89 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
@@ -537,11 +537,11 @@
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());
sysUser.setSiteNames(siteNames);
+ sysUser.setSiteIds(data.stream().map(Site::getId).collect(Collectors.toList()));
}
List<String> roleNames = new ArrayList<>();
for (SysUserRole sysUserRole : list1) {
--
Gitblit v1.7.1