java/qijisheng.git

			@@ -2,8 +2,6 @@

			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.constant.UserConstants;
			import com.ruoyi.common.core.exception.ServiceException;
			import com.ruoyi.common.core.utils.SpringUtils;
			@@ -13,8 +11,7 @@
			import com.ruoyi.common.datascope.annotation.DataScope;
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.common.security.utils.SecurityUtils;
			import com.ruoyi.other.api.feignClient.RoleSiteClient;
			import com.ruoyi.other.api.feignClient.UserSiteClient;
			import com.ruoyi.system.api.domain.SysDept;
			import com.ruoyi.system.api.domain.SysRole;
			import com.ruoyi.system.api.domain.SysUser;
			import com.ruoyi.system.api.query.ChangeUserQuery;
			@@ -23,12 +20,10 @@
			import com.ruoyi.system.domain.SysUserRole;
			import com.ruoyi.system.mapper.*;
			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 com.ruoyi.system.service.*;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.context.annotation.Lazy;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;
			@@ -75,19 +70,14 @@
			private ISysUserRoleService sysUserRoleService;

			@Resource
			private RoleSiteClient roleSiteClient;

			@Resource
			private UserSiteClient userSiteClient;

			@Resource
			private SiteClient siteClient;

			@Resource
			private ISysRoleService sysRoleService;

			@Resource
			private TokenService tokenService;

			@Lazy
			@Resource
			private ISysDeptService deptService;


			/**
			@@ -522,35 +512,27 @@

			@Override
			public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList) {
			Long userid = tokenService.getLoginUser().getUserid();
			SysUser sysUser1 = this.getById(userid);
			if(sysUser1.getRoleType() == 2){
			getSysUserList.setObjectId(sysUser1.getObjectId());
			}
			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());
			if(null == sysRole){
			continue;
			}
			roleNames.add(sysRole.getRoleName());
			}
			Long[] roleIds = new Long[]{};
			sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds));
			sysUser.setRoleNames(roleNames);
			SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
			sysUser.setDept(sysDept);
			}
			return pageInfo.setRecords(list);
			}
			@@ -572,6 +554,11 @@

			@Override
			public PageInfo<SysUser> getChangeUserList(ChangeUserQuery query) {
			Long userid = tokenService.getLoginUser().getUserid();
			SysUser sysUser1 = this.getById(userid);
			if(sysUser1.getRoleType() == 2){
			query.setObjectId(sysUser1.getObjectId());
			}
			PageInfo<SysUser> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
			List<SysUser> list = this.baseMapper.getChangeUserList(pageInfo, query);
			return pageInfo.setRecords(list);