兰宝车间质量管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
gssong
2024-08-24 79aee1d3127c8be0184bc6493b08fb2ba2f1a8ae 
 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java


@@ -1,6 +1,8 @@


package org.dromara.system.service.impl;




import cn.hutool.core.bean.BeanUtil;


import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.convert.Convert;


import cn.hutool.core.util.ArrayUtil;


import cn.hutool.core.util.ObjectUtil;


import com.baomidou.mybatisplus.core.conditions.Wrapper;


@@ -13,19 +15,18 @@


import lombok.extern.slf4j.Slf4j;


import org.dromara.common.core.constant.CacheNames;


import org.dromara.common.core.constant.UserConstants;


import org.dromara.common.core.domain.dto.UserDTO;


import org.dromara.common.core.exception.ServiceException;


import org.dromara.common.core.service.UserService;


import org.dromara.common.core.utils.MapstructUtils;


import org.dromara.common.core.utils.SpringUtils;


import org.dromara.common.core.utils.StreamUtils;


import org.dromara.common.core.utils.StringUtils;


import org.dromara.common.mybatis.core.page.PageQuery;


import org.dromara.common.mybatis.core.page.TableDataInfo;


import org.dromara.common.mybatis.helper.DataBaseHelper;


import org.dromara.common.satoken.utils.LoginHelper;


import org.dromara.system.domain.SysDept;


import org.dromara.system.domain.SysUser;


import org.dromara.system.domain.SysUserPost;


import org.dromara.system.domain.SysUserRole;


import org.dromara.system.domain.*;


import org.dromara.system.domain.bo.SysUserBo;


import org.dromara.system.domain.vo.SysPostVo;


import org.dromara.system.domain.vo.SysRoleVo;


@@ -33,10 +34,12 @@


import org.dromara.system.domain.vo.SysUserVo;


import org.dromara.system.mapper.*;


import org.dromara.system.service.ISysUserService;


import org.springframework.cache.annotation.CacheEvict;


import org.springframework.cache.annotation.Cacheable;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import java.util.ArrayList;


import java.util.List;


import java.util.Map;




@@ -92,6 +95,9 @@


                ids.add(user.getDeptId());


                w.in("u.dept_id", ids);


            }).orderByAsc("u.user_id");


        if (StringUtils.isNotBlank(user.getExcludeUserIds())) {


            wrapper.notIn("u.user_id", StringUtils.splitTo(user.getExcludeUserIds(), Convert::toLong));


        }


        return wrapper;


    }




@@ -330,6 +336,7 @@


     * @return 结果


     */


    @Override


    @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId")


    @Transactional(rollbackFor = Exception.class)


    public int updateUser(SysUserBo user) {


        // 新增用户与角色管理


@@ -378,6 +385,7 @@


     * @param user 用户信息


     * @return 结果


     */


    @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId")


    @Override


    public int updateUserProfile(SysUserBo user) {


        return baseMapper.update(null,


@@ -462,17 +470,14 @@


     */


    private void insertUserRole(Long userId, Long[] roleIds, boolean clear) {


        if (ArrayUtil.isNotEmpty(roleIds)) {


            // 判断是否具有此角色的操作权限


            List<SysRoleVo> roles = roleMapper.selectRoleList(new LambdaQueryWrapper<>());


            if (CollUtil.isEmpty(roles)) {


                throw new ServiceException("没有权限访问角色的数据");


            }


            List<Long> roleList = StreamUtils.toList(roles, SysRoleVo::getRoleId);


            List<Long> roleList = new ArrayList<>(List.of(roleIds));


            if (!LoginHelper.isSuperAdmin(userId)) {


                roleList.remove(UserConstants.SUPER_ADMIN_ID);


            }


            List<Long> canDoRoleList = StreamUtils.filter(List.of(roleIds), roleList::contains);


            if (CollUtil.isEmpty(canDoRoleList)) {


            // 判断是否具有此角色的操作权限


            List<SysRoleVo> roles = roleMapper.selectRoleList(


                new QueryWrapper<SysRole>().in("r.role_id", roleList));


            if (CollUtil.isEmpty(roles)) {


                throw new ServiceException("没有权限访问角色的数据");


            }


            if (clear) {


@@ -480,7 +485,7 @@


                userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));


            }


            // 新增用户与角色管理


            List<SysUserRole> list = StreamUtils.toList(canDoRoleList, roleId -> {


            List<SysUserRole> list = StreamUtils.toList(roleList, roleId -> {


                SysUserRole ur = new SysUserRole();


                ur.setUserId(userId);


                ur.setRoleId(roleId);


@@ -530,7 +535,7 @@


        // 删除用户与岗位表


        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId, ids));


        // 防止更新失败导致的数据删除


        int flag = baseMapper.deleteBatchIds(ids);


        int flag = baseMapper.deleteByIds(ids);


        if (flag < 1) {


            throw new ServiceException("删除用户失败!");


        }


@@ -580,6 +585,24 @@


    }




    /**


     * 通过用户ID查询用户账户


     *


     * @param userIds 用户ID 多个用逗号隔开


     * @return 用户账户


     */


    @Override


    public String selectNicknameByIds(String userIds) {


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


        for (Long id : StringUtils.splitTo(userIds, Convert::toLong)) {


            String nickname = SpringUtils.getAopProxy(this).selectNicknameById(id);


            if (StringUtils.isNotBlank(nickname)) {


                list.add(nickname);


            }


        }


        return String.join(StringUtils.SEPARATOR, list);


    }




    /**


     * 通过用户ID查询用户手机号


     *


     * @param userId 用户id


@@ -605,4 +628,45 @@


        return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail();


    }




    @Override


    public List<UserDTO> selectListByIds(List<Long> userIds) {


        if (CollUtil.isEmpty(userIds)) {


            return List.of();


        }


        List<SysUserVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysUser>()


            .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber)


            .eq(SysUser::getStatus, UserConstants.USER_NORMAL)


            .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));


        return BeanUtil.copyToList(list, UserDTO.class);


    }




    @Override


    public List<Long> selectUserIdsByRoleIds(List<Long> roleIds) {


        List<SysUserRole> userRoles = userRoleMapper.selectList(


            new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));


        return StreamUtils.toList(userRoles, SysUserRole::getUserId);


    }




    @Override


    public List<UserDTO> selectUsersByRoleIds(List<Long> roleIds) {


        if (CollUtil.isEmpty(roleIds)) {


            return List.of();


        }


        List<SysUserRole> userRoles = userRoleMapper.selectList(


            new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));


        List<Long> userIds = StreamUtils.toList(userRoles, SysUserRole::getUserId);


        return selectListByIds(userIds);


    }




    @Override


    public List<UserDTO> selectUsersByDeptIds(List<Long> deptIds) {


        if (CollUtil.isEmpty(deptIds)) {


            return List.of();


        }


        List<SysUserVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysUser>()


            .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber)


            .eq(SysUser::getStatus, UserConstants.USER_NORMAL)


            .in(CollUtil.isNotEmpty(deptIds), SysUser::getDeptId, deptIds));


        return BeanUtil.copyToList(list, UserDTO.class);


    }


}