明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-08-21 882959fb6bb60c72b39cb1d66a49634c4579159e 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java


@@ -21,6 +21,7 @@


import com.ruoyi.system.domain.SysUserRole;


import com.ruoyi.system.query.GetSysUserList;


import com.ruoyi.system.service.ISysConfigService;


import com.ruoyi.system.service.ISysRoleService;


import com.ruoyi.system.service.ISysUserRoleService;


import com.ruoyi.system.service.ISysUserService;


import org.slf4j.Logger;


@@ -86,6 +87,9 @@


    


    @Resource


    private SiteClient siteClient;




    @Resource


    private ISysRoleService sysRoleService;


    


    


    


@@ -578,18 +582,30 @@


        for (SysUser sysUser : list) {


            List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));


            List<Integer> data1 = userSiteClient.getSiteIds(sysUser.getUserId()).getData();


            if(null == data1){


                data1 = new ArrayList<>();


            }


            for (SysUserRole sysUserRole : list1) {


                List<Integer> data = roleSiteClient.getSiteIds(sysUserRole.getRoleId()).getData();


                if (null == data){


                    continue;


                }


                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();


            List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());


            sysUser.setSiteNames(siteNames);


    


            Set<Long> collect = list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet());


            List<SysRole> sysRoles = roleMapper.selectBatchIds(collect);


            List<String> roleNames = sysRoles.stream().map(SysRole::getRoleName).collect(Collectors.toList());


            if(null != data){


                List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());


                sysUser.setSiteNames(siteNames);


            }


            List<String> roleNames = new ArrayList<>();


            for (SysUserRole sysUserRole : list1) {


                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);