|
@@ -162,6 +162,7 @@ private FamilyInvitationService familyInvitationService;
|
|
|
|
|
|
|
|
// 新用户需要完善信息(仅当需要选择角色时)
|
|
// 新用户需要完善信息(仅当需要选择角色时)
|
|
|
result.setNeedsRoleSelect(isNewUser);
|
|
result.setNeedsRoleSelect(isNewUser);
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@@ -241,6 +242,7 @@ private FamilyInvitationService familyInvitationService;
|
|
|
result.setNickname(user.getNickname());
|
|
result.setNickname(user.getNickname());
|
|
|
result.setIsNewUser(isNewUser);
|
|
result.setIsNewUser(isNewUser);
|
|
|
result.setNeedsRoleSelect(isNewUser);
|
|
result.setNeedsRoleSelect(isNewUser);
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@@ -300,6 +302,7 @@ private FamilyInvitationService familyInvitationService;
|
|
|
result.setNickname(user.getNickname());
|
|
result.setNickname(user.getNickname());
|
|
|
result.setIsNewUser(false);
|
|
result.setIsNewUser(false);
|
|
|
result.setOpenid(openid);
|
|
result.setOpenid(openid);
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@@ -334,6 +337,7 @@ private FamilyInvitationService familyInvitationService;
|
|
|
result.setNickname(user.getNickname());
|
|
result.setNickname(user.getNickname());
|
|
|
result.setIsNewUser(false);
|
|
result.setIsNewUser(false);
|
|
|
result.setOpenid(openid);
|
|
result.setOpenid(openid);
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@@ -424,6 +428,7 @@ private FamilyInvitationService familyInvitationService;
|
|
|
result.setFamilyId(user.getFamilyId());
|
|
result.setFamilyId(user.getFamilyId());
|
|
|
result.setNickname(user.getNickname());
|
|
result.setNickname(user.getNickname());
|
|
|
result.setIsNewUser(true);
|
|
result.setIsNewUser(true);
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@@ -499,6 +504,7 @@ private FamilyInvitationService familyInvitationService;
|
|
|
result.setFamilyId(user.getFamilyId());
|
|
result.setFamilyId(user.getFamilyId());
|
|
|
result.setNickname(user.getNickname());
|
|
result.setNickname(user.getNickname());
|
|
|
result.setIsNewUser(false);
|
|
result.setIsNewUser(false);
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
@@ -803,6 +809,7 @@ private FamilyInvitationService familyInvitationService;
|
|
|
result.setRole(user.getRole());
|
|
result.setRole(user.getRole());
|
|
|
result.setFamilyId(user.getFamilyId());
|
|
result.setFamilyId(user.getFamilyId());
|
|
|
result.setNickname(user.getNickname());
|
|
result.setNickname(user.getNickname());
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@@ -1217,6 +1224,7 @@ FamilyMember child = familyMemberMapper.selectById(memberId);
|
|
|
result.setFamilyId(user.getFamilyId());
|
|
result.setFamilyId(user.getFamilyId());
|
|
|
result.setNickname(user.getNickname());
|
|
result.setNickname(user.getNickname());
|
|
|
result.setIsNewUser(true);
|
|
result.setIsNewUser(true);
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
@@ -1292,6 +1300,7 @@ FamilyMember child = familyMemberMapper.selectById(memberId);
|
|
|
result.setFamilyId(user.getFamilyId());
|
|
result.setFamilyId(user.getFamilyId());
|
|
|
result.setNickname(user.getNickname());
|
|
result.setNickname(user.getNickname());
|
|
|
result.setIsNewUser(isNewUser);
|
|
result.setIsNewUser(isNewUser);
|
|
|
|
|
+ result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
|
|
|
populateTeacherFields(result, user);
|
|
populateTeacherFields(result, user);
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|