From b8f9b07913de4c088d86565c3b331b9263a9027c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 21 十一月 2024 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 42 ------------------------------------------
1 files changed, 0 insertions(+), 42 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 673d496..6807712 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
@@ -10,12 +10,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
-import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.feignClient.RoleSiteClient;
-import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.query.ChangeUserQuery;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
@@ -78,15 +74,6 @@
@Resource
private ISysUserRoleService sysUserRoleService;
-
- @Resource
- private RoleSiteClient roleSiteClient;
-
- @Resource
- private UserSiteClient userSiteClient;
-
- @Resource
- private SiteClient siteClient;
@Resource
private ISysRoleService sysRoleService;
@@ -528,35 +515,6 @@
@Override
public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList) {
List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
- 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);
- 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) {
- 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