|
|
@@ -1415,7 +1415,7 @@ FamilyMember child = familyMemberMapper.selectById(memberId);
|
|
|
user = existingUser;
|
|
|
ensureUserHasFamily(user);
|
|
|
try {
|
|
|
- familyJoinRequestService.createJoinRequest(user.getId(), inviteCode);
|
|
|
+ familyJoinRequestService.createJoinRequest(user.getId(), inviteCode, null);
|
|
|
log.info("已为用户 {} 提交加入家庭 {} 的请求", user.getId(), family.getId());
|
|
|
} catch (Exception e) {
|
|
|
log.warn("提交加入家庭请求失败: {}", e.getMessage());
|
|
|
@@ -1433,7 +1433,7 @@ FamilyMember child = familyMemberMapper.selectById(memberId);
|
|
|
user.setUpdatedAt(new Date());
|
|
|
createUserAndFamily(user);
|
|
|
try {
|
|
|
- familyJoinRequestService.createJoinRequest(user.getId(), inviteCode);
|
|
|
+ familyJoinRequestService.createJoinRequest(user.getId(), inviteCode, null);
|
|
|
log.info("已为用户 {} 提交加入家庭 {} 的请求", user.getId(), family.getId());
|
|
|
} catch (Exception e) {
|
|
|
log.warn("提交加入家庭请求失败: {}", e.getMessage());
|