|
|
@ -370,7 +370,7 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//账号id
|
|
|
|
//账号id
|
|
|
|
Integer usernameId = 0; |
|
|
|
int usernameId = 0; |
|
|
|
|
|
|
|
|
|
|
|
vo1.setIndex(ii); |
|
|
|
vo1.setIndex(ii); |
|
|
|
//检验姓名
|
|
|
|
//检验姓名
|
|
|
@ -508,7 +508,7 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme |
|
|
|
errMsg += countNum + " *请输入正确的邮箱格式!"; |
|
|
|
errMsg += countNum + " *请输入正确的邮箱格式!"; |
|
|
|
ret = false; |
|
|
|
ret = false; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if ("0".equals(usernameId)){ |
|
|
|
if (0==usernameId){ |
|
|
|
LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery(); |
|
|
|
LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery(); |
|
|
|
queryWrapper.eq(SysUser::getEmail, getEmail); |
|
|
|
queryWrapper.eq(SysUser::getEmail, getEmail); |
|
|
|
SysUser selectOne = baseMapper.selectOne(queryWrapper); |
|
|
|
SysUser selectOne = baseMapper.selectOne(queryWrapper); |
|
|
@ -597,7 +597,7 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme |
|
|
|
//ret判断 新增成功的插入到数据库 否则则不新增至数据库
|
|
|
|
//ret判断 新增成功的插入到数据库 否则则不新增至数据库
|
|
|
|
if (ret) { |
|
|
|
if (ret) { |
|
|
|
//用户账号不存在
|
|
|
|
//用户账号不存在
|
|
|
|
if ("0".equals(usernameId)){ |
|
|
|
if (0==usernameId){ |
|
|
|
SysUser vo = new SysUser(); |
|
|
|
SysUser vo = new SysUser(); |
|
|
|
vo.setSalt(PasswordUtils.getSalt()); |
|
|
|
vo.setSalt(PasswordUtils.getSalt()); |
|
|
|
String encode = PasswordUtils.encode("1122aa", vo.getSalt()); |
|
|
|
String encode = PasswordUtils.encode("1122aa", vo.getSalt()); |
|
|
|