|
|
|
|
@ -2,8 +2,11 @@ package com.ruoyi.system.service.impl;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.ruoyi.common.core.constant.UserConstants;
|
|
|
|
|
import com.ruoyi.common.core.exception.ServiceException;
|
|
|
|
|
@ -11,6 +14,7 @@ import com.ruoyi.common.core.utils.StringUtils;
|
|
|
|
|
import com.ruoyi.common.mybatis.core.page.PageQuery;
|
|
|
|
|
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
import com.ruoyi.common.satoken.utils.LoginHelper;
|
|
|
|
|
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.domain.SysPost;
|
|
|
|
|
@ -27,6 +31,7 @@ import org.springframework.util.CollectionUtils;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -40,6 +45,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
|
|
|
|
|
private final SysUserMapper baseMapper;
|
|
|
|
|
private final SysDeptMapper deptMapper;
|
|
|
|
|
private final SysRoleMapper roleMapper;
|
|
|
|
|
private final SysPostMapper postMapper;
|
|
|
|
|
private final SysUserRoleMapper userRoleMapper;
|
|
|
|
|
@ -47,7 +53,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
|
|
|
|
|
Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), user);
|
|
|
|
|
Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
|
|
|
|
|
return TableDataInfo.build(page);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -59,7 +65,28 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public List<SysUser> selectUserList(SysUser user) {
|
|
|
|
|
return baseMapper.selectUserList(user);
|
|
|
|
|
return baseMapper.selectUserList(this.buildQueryWrapper(user));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private Wrapper<SysUser> buildQueryWrapper(SysUser user) {
|
|
|
|
|
Map<String, Object> params = user.getParams();
|
|
|
|
|
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
|
|
|
|
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
|
|
|
|
|
.eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
|
|
|
|
|
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
|
|
|
|
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
|
|
|
|
|
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
|
|
|
|
|
.between(params.get("beginTime") != null && params.get("endTime") != null,
|
|
|
|
|
"u.create_time", params.get("beginTime"), params.get("endTime"))
|
|
|
|
|
.and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
|
|
|
|
|
List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
|
|
|
|
|
.select(SysDept::getDeptId)
|
|
|
|
|
.apply("find_in_set({0},ancestors)", user.getDeptId()));
|
|
|
|
|
w.eq("u.dept_id", user.getDeptId())
|
|
|
|
|
.or()
|
|
|
|
|
.in("u.dept_id", deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
|
|
|
|
|
});
|
|
|
|
|
return wrapper;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -70,7 +97,13 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery) {
|
|
|
|
|
Page<SysUser> page = baseMapper.selectAllocatedList(pageQuery.build(), user);
|
|
|
|
|
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
|
|
|
|
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
|
|
|
|
|
.eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
|
|
|
|
|
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
|
|
|
|
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
|
|
|
|
|
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber());
|
|
|
|
|
Page<SysUser> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
|
|
|
|
|
return TableDataInfo.build(page);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -82,7 +115,14 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
|
|
|
|
|
Page<SysUser> page = baseMapper.selectUnallocatedList(pageQuery.build(), user);
|
|
|
|
|
Long userId = userRoleMapper.selectUserIdByRoleId(user.getRoleId());
|
|
|
|
|
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
|
|
|
|
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
|
|
|
|
|
.and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
|
|
|
|
|
.notIn("u.user_id", userId)
|
|
|
|
|
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
|
|
|
|
|
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber());
|
|
|
|
|
Page<SysUser> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
|
|
|
|
|
return TableDataInfo.build(page);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -258,11 +298,11 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
public int updateUser(SysUser user) {
|
|
|
|
|
Long userId = user.getUserId();
|
|
|
|
|
// 删除用户与角色关联
|
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
|
userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
|
|
|
|
|
// 新增用户与角色管理
|
|
|
|
|
insertUserRole(user);
|
|
|
|
|
// 删除用户与岗位关联
|
|
|
|
|
userPostMapper.deleteUserPostByUserId(userId);
|
|
|
|
|
userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
|
|
|
|
|
// 新增用户与岗位管理
|
|
|
|
|
insertUserPost(user);
|
|
|
|
|
return baseMapper.updateById(user);
|
|
|
|
|
@ -362,7 +402,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
list.add(ur);
|
|
|
|
|
}
|
|
|
|
|
if (list.size() > 0) {
|
|
|
|
|
userRoleMapper.batchUserRole(list);
|
|
|
|
|
userRoleMapper.insertBatch(list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -384,7 +424,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
list.add(up);
|
|
|
|
|
}
|
|
|
|
|
if (list.size() > 0) {
|
|
|
|
|
userPostMapper.batchUserPost(list);
|
|
|
|
|
userPostMapper.insertBatch(list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -406,7 +446,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
list.add(ur);
|
|
|
|
|
}
|
|
|
|
|
if (list.size() > 0) {
|
|
|
|
|
userRoleMapper.batchUserRole(list);
|
|
|
|
|
userRoleMapper.insertBatch(list);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|