|
@@ -955,8 +955,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(userInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
|
|
sysUserVo.getSysUserInfo().setLiveAddress(Arrays.stream(userInfo.getLiveAddressString()).map(item -> item.toString()).collect(Collectors.joining(",")));
|
|
|
}
|
|
}
|
|
|
userInfo.setId(sysUser.getId());
|
|
userInfo.setId(sysUser.getId());
|
|
|
|
|
+ }else {
|
|
|
|
|
+ userInfo=new SysUserInfo();
|
|
|
|
|
+ userInfo.setId(sysUser.getId());
|
|
|
}
|
|
}
|
|
|
-// userInfo.setId(sysUser.getId());
|
|
|
|
|
sysUserInfoService.save(userInfo);
|
|
sysUserInfoService.save(userInfo);
|
|
|
}
|
|
}
|
|
|
List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
|
|
List<EsmUserImageVo> esmUserImageVo = sysUserVo.getEsmUserImageVo();
|
|
@@ -965,7 +967,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
|
|
List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
|
|
|
esmUserImageService.saveBatch(esmUserImages);
|
|
esmUserImageService.saveBatch(esmUserImages);
|
|
|
}
|
|
}
|
|
|
- SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUserVo.getReferrerId()).orElse("admin") );
|
|
|
|
|
|
|
+ SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUserVo.getSysUser().getReferrerId()).orElse("admin") );
|
|
|
return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
|
|
return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1128,7 +1130,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
|
|
List<EsmUserImage> esmUserImages = esmUserImageVo.stream().map(x -> new EsmUserImage(x, finalUserId)).collect(Collectors.toList());
|
|
|
esmUserImageService.saveBatch(esmUserImages);
|
|
esmUserImageService.saveBatch(esmUserImages);
|
|
|
}
|
|
}
|
|
|
- SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUserVo.getReferrerId()).orElse("admin"));
|
|
|
|
|
|
|
+ SpringUtil.getBean(RecordUserUtils.class).addRecord(userId, Optional.ofNullable(sysUserVo.getSysUser().getReferrerId()).orElse("admin"));
|
|
|
return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
|
|
return HttpResult.ok("新增成功", sysUserMapper.selectById(userId));
|
|
|
}
|
|
}
|
|
|
|
|
|