From e2ab44b7724f8c9283b9d3a333b6f850702fd171 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 七月 2026 18:39:07 +0800
Subject: [PATCH] Merge branch '2.2' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.2
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 db131f6..a8c3518 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
@@ -548,11 +548,13 @@
data1.addAll(data);
}
Set<Integer> siteIds = new HashSet<>(data1);
- 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()));
+ if (!applyAllSitePermission(sysUser, siteIds)) {
+ List<Site> data = siteClient.getSiteByIds(new ArrayList<>(siteIds)).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) {
@@ -565,6 +567,15 @@
}
return pageInfo.setRecords(list);
}
+
+ static boolean applyAllSitePermission(SysUser sysUser, Set<Integer> siteIds) {
+ if (!siteIds.contains(0)) {
+ return false;
+ }
+ sysUser.setSiteNames(Collections.singletonList("全部"));
+ sysUser.setSiteIds(Collections.singletonList(0));
+ return true;
+ }
@Override
public PageInfo<SysUser> getAllList(PageInfo<SysUser> pageInfo, List<Integer> collect) {
--
Gitblit v1.7.1