提交 189efee7 authored 作者: 000516's avatar 000516

user对象中,删除roleid\rolename

...@@ -254,10 +254,6 @@ public class SysUserDaoImpl implements ISysUserDao { ...@@ -254,10 +254,6 @@ public class SysUserDaoImpl implements ISysUserDao {
SysUser user = new SysUser(); SysUser user = new SysUser();
BeanUtils.copyProperties(userVo, user); BeanUtils.copyProperties(userVo, user);
// 补充角色
SysRole sysRole = roleMapper.selectById(user.getRoleId());
user.setRoleName(sysRole.getRoleName());
// 新增用户信息 // 新增用户信息
int rows = userMapper.insert(user); int rows = userMapper.insert(user);
// 新增用户岗位关联 // 新增用户岗位关联
...@@ -551,41 +547,8 @@ public class SysUserDaoImpl implements ISysUserDao { ...@@ -551,41 +547,8 @@ public class SysUserDaoImpl implements ISysUserDao {
@Override @Override
public PageInfo selectUserPage(SysUserWq sysUserWq) { public PageInfo selectUserPage(SysUserWq sysUserWq) {
// LambdaQueryWrapper<SysUser> qw = buildWrapper(sysUserWq);
// Page<SysUser> pageR = userMapper.selectPage(TableSupport.pageI(), qw);
Page<SysUser> pageR = userMapper.selectUserPage(TableSupport.pageI(), sysUserWq); Page<SysUser> pageR = userMapper.selectUserPage(TableSupport.pageI(), sysUserWq);
PageInfo<SysUser> pageInfo = new PageInfo<>(pageR); PageInfo<SysUser> pageInfo = new PageInfo<>(pageR);
return pageInfo; return pageInfo;
} }
private LambdaQueryWrapper<SysUser> buildWrapper(SysUserWq sysUserWq) {
LambdaQueryWrapper<SysUser> qw = new LambdaQueryWrapper<>();
qw.eq(SysUser::getDelFlag, "0");
if (StringUtils.isNotBlank(sysUserWq.getStatus())) {
qw.eq(SysUser::getStatus, sysUserWq.getStatus());
}
if (Objects.nonNull(sysUserWq.getRoleId())) {
qw.eq(SysUser::getRoleId, sysUserWq.getRoleId());
}
if (Objects.nonNull(sysUserWq.getDeptId())) {
qw.eq(SysUser::getDeptId, sysUserWq.getDeptId());
}
if (Objects.nonNull(sysUserWq.getExistRole()) && !sysUserWq.getExistRole()){
qw.isNull(SysUser::getRoleId);
}
if (StringUtils.isNotBlank(sysUserWq.getNickNameLike())) {
qw.like(SysUser::getNickName, sysUserWq.getNickNameLike());
}
if (StringUtils.isNotBlank(sysUserWq.getUserNameLike())) {
qw.like(SysUser::getUserName, sysUserWq.getUserNameLike());
}
if (StringUtils.isNotBlank(sysUserWq.getPhonenumberLike())) {
qw.like(SysUser::getPhonenumber, sysUserWq.getPhonenumberLike());
}
if (Objects.nonNull(sysUserWq.getBeginTime())&&Objects.nonNull(sysUserWq.getEndTime())){
qw.between(SysUser::getCreateTime, sysUserWq.getBeginTime(),sysUserWq.getEndTime());
}
return qw;
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论