岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2024-12-10 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49 
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java


@@ -1,21 +1,23 @@


package com.ruoyi.system.service.impl;




import java.util.ArrayList;


import java.util.HashSet;


import java.util.List;


import java.util.Set;


import java.util.stream.Collectors;


import javax.annotation.Resource;


import javax.validation.Validator;




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ruoyi.common.core.constant.UserConstants;


import com.ruoyi.common.core.exception.ServiceException;


import com.ruoyi.common.core.utils.SpringUtils;


import com.ruoyi.common.core.utils.StringUtils;


import com.ruoyi.common.core.utils.bean.BeanValidators;


import com.ruoyi.common.core.web.page.PageInfo;


import com.ruoyi.common.datascope.annotation.DataScope;


import com.ruoyi.common.security.service.TokenService;


import com.ruoyi.common.security.utils.SecurityUtils;


import com.ruoyi.system.api.domain.SysRole;


import com.ruoyi.system.api.domain.SysUser;


import com.ruoyi.system.api.query.ChangeUserQuery;


import com.ruoyi.system.domain.SysPost;


import com.ruoyi.system.domain.SysUserPost;


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;


@@ -23,24 +25,17 @@


import com.ruoyi.system.service.ISysUserService;


import org.slf4j.Logger;


import org.slf4j.LoggerFactory;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.CollectionUtils;


import com.ruoyi.common.core.constant.UserConstants;


import com.ruoyi.common.core.exception.ServiceException;


import com.ruoyi.common.core.utils.SpringUtils;


import com.ruoyi.common.core.utils.StringUtils;


import com.ruoyi.common.core.utils.bean.BeanValidators;


import com.ruoyi.common.datascope.annotation.DataScope;


import com.ruoyi.common.security.utils.SecurityUtils;


import com.ruoyi.system.api.domain.SysRole;


import com.ruoyi.system.api.domain.SysUser;


import com.ruoyi.system.mapper.SysPostMapper;


import com.ruoyi.system.mapper.SysRoleMapper;


import com.ruoyi.system.mapper.SysUserMapper;


import com.ruoyi.system.mapper.SysUserPostMapper;


import com.ruoyi.system.mapper.SysUserRoleMapper;




import javax.annotation.Resource;


import javax.validation.Validator;


import java.util.ArrayList;


import java.util.HashSet;


import java.util.List;


import java.util.Set;


import java.util.stream.Collectors;




/**


 * 用户 业务层处理


@@ -515,6 +510,17 @@


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


   }