longz
2026-07-21 b3bf3ffc39e813adc9aa4f533abb9edc4cee6e50
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) {