|
|
@@ -168,6 +168,7 @@ private FamilyInvitationService familyInvitationService;
|
|
|
result.setNeedsRoleSelect(isNewUser);
|
|
|
result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
|
+ populateActivityProviderFields(result, user);
|
|
|
|
|
|
return result;
|
|
|
}
|
|
|
@@ -1532,6 +1533,7 @@ FamilyMember child = familyMemberMapper.selectById(memberId);
|
|
|
result.setIsNewUser(true);
|
|
|
result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
|
+ populateActivityProviderFields(result, user);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
@@ -1770,6 +1772,11 @@ FamilyMember child = familyMemberMapper.selectById(memberId);
|
|
|
result.setHasTeacherRole(hasTeacher);
|
|
|
}
|
|
|
|
|
|
+ private void populateActivityProviderFields(LoginResultDTO result, User user) {
|
|
|
+ result.setVendorType(user.getVendorType());
|
|
|
+ result.setActivityProviderStatus(user.getActivityProviderStatus());
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 获取用户有效的 familyId 集合:自己的 familyId + teacherFamilyIds 中关联的家庭。
|
|
|
* @param userId 用户ID
|