|
@@ -575,9 +575,6 @@ public class SysUserServiceImpl implements ISysUserService
|
|
in.setUserName(userName);
|
|
in.setUserName(userName);
|
|
in.setNickName(userName);
|
|
in.setNickName(userName);
|
|
in.setDeptId(user.getDeptId());
|
|
in.setDeptId(user.getDeptId());
|
|
- List<Long> roleIds = new ArrayList<>();
|
|
|
|
- roleIds.add(3L);
|
|
|
|
- user.setRoleIds(roleIds.toArray(new Long[0]));
|
|
|
|
in.setPassword(password);
|
|
in.setPassword(password);
|
|
res.add(in);
|
|
res.add(in);
|
|
}
|
|
}
|
|
@@ -585,6 +582,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
SysUser in = new SysUser();
|
|
SysUser in = new SysUser();
|
|
BeanUtils.copyProperties(r, in);
|
|
BeanUtils.copyProperties(r, in);
|
|
in.setPassword(SecurityUtils.encryptPassword(in.getPassword()));
|
|
in.setPassword(SecurityUtils.encryptPassword(in.getPassword()));
|
|
|
|
+ List<Long> roleIds = new ArrayList<>();
|
|
|
|
+ roleIds.add(2L);
|
|
|
|
+ in.setRoleIds(roleIds.toArray(new Long[0]));
|
|
userMapper.insertUser(in);
|
|
userMapper.insertUser(in);
|
|
});
|
|
});
|
|
SysDept dept = sysDeptMapper.selectDeptById(user.getDeptId());
|
|
SysDept dept = sysDeptMapper.selectDeptById(user.getDeptId());
|