西藏国投
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2025-04-27 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java


@@ -1,27 +1,8 @@


package com.ruoyi.system.service.impl;




import java.util.ArrayList;


import java.util.List;


import java.util.Objects;


import java.util.stream.Collectors;


import javax.validation.Validator;




import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.ruoyi.common.basic.PageInfo;


import com.ruoyi.common.core.domain.entity.SysDept;


import com.ruoyi.system.mapper.*;


import com.ruoyi.system.model.TDept;


import com.ruoyi.system.model.TDeptToUser;


import com.ruoyi.system.query.SysUserQuery;


import com.ruoyi.system.service.TDeptToUserService;


import com.ruoyi.system.vo.SysUserVO;


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.annotation.DataScope;


import com.ruoyi.common.basic.PageInfo;


import com.ruoyi.common.constant.UserConstants;


import com.ruoyi.common.core.domain.entity.SysRole;


import com.ruoyi.common.core.domain.entity.SysUser;


@@ -33,8 +14,32 @@


import com.ruoyi.system.domain.SysPost;


import com.ruoyi.system.domain.SysUserPost;


import com.ruoyi.system.domain.SysUserRole;


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 com.ruoyi.system.mapper.TDeptMapper;


import com.ruoyi.system.mapper.TDeptToUserMapper;


import com.ruoyi.system.model.TDept;


import com.ruoyi.system.model.TDeptToUser;


import com.ruoyi.system.query.SysUserQuery;


import com.ruoyi.system.service.ISysConfigService;


import com.ruoyi.system.service.ISysUserService;


import com.ruoyi.system.service.TDeptToUserService;


import com.ruoyi.system.vo.SysUserVO;


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 javax.validation.Validator;


import java.util.ArrayList;


import java.util.List;


import java.util.Objects;


import java.util.stream.Collectors;




/**


 * 用户 业务层处理


@@ -60,6 +65,8 @@




    @Autowired


    private SysUserPostMapper userPostMapper;


    @Autowired


    private TDeptToUserService deptToUserService;


    @Autowired


    private TDeptToUserMapper deptToUserMapper;




@@ -495,7 +502,7 @@


                deptToUser.setDeptId(deptId);


                deptToUserList.add(deptToUser);


            }


            deptToUserMapper.insertBatchUserDept(deptToUserList);


            deptToUserService.saveBatch(deptToUserList);


        }


    }




@@ -663,6 +670,8 @@


    @Override


    public PageInfo<SysUserVO> pageList(SysUserQuery query) {


        PageInfo<SysUserVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());


        String businessDeptId = SecurityUtils.getBusinessDeptId();


        query.setBusinessDeptId(businessDeptId);


        List<SysUserVO> list = userMapper.pageList(query,pageInfo);


        if(CollectionUtils.isEmpty(list)){


            return pageInfo;


@@ -670,7 +679,7 @@


        List<Long> userIds = list.stream().map(SysUserVO::getUserId).collect(Collectors.toList());


        // 查询所有部门


        List<TDept> depts = deptMapper.selectList(Wrappers.lambdaQuery(TDept.class));


        List<TDeptToUser> tDeptToUsers = deptToUserMapper.selectList(Wrappers.lambdaQuery(TDeptToUser.class)


        List<TDeptToUser> tDeptToUsers = deptToUserService.list(Wrappers.lambdaQuery(TDeptToUser.class)


                .in(TDeptToUser::getUserId, userIds));


        for (SysUserVO sysUserVO : list) {


            tDeptToUsers.stream().filter(tDeptToUser -> tDeptToUser.getUserId().equals(sysUserVO.getUserId())).forEach(tDeptToUser -> {