This commit is contained in:
tanglong 2025-06-13 10:47:29 +08:00
parent de51e13976
commit c6551e5eab

View File

@ -162,12 +162,29 @@ namespace YD_WeChatApplet.Services
private async Task<UserModelDataDto> GetParentUser(LoginInfo paramDto) private async Task<UserModelDataDto> GetParentUser(LoginInfo paramDto)
{ {
//var parentUser = await _smartSportsContext.Student
// .FirstOrDefaultAsync(x => x.StudentName == paramDto.Key && x.StudentNo == paramDto.Password && x.StudentStatus == 1);
var parentUser = await _smartSportsContext.Student var parentUser = await _smartSportsContext.Student
.FirstOrDefaultAsync(x => x.StudentName == paramDto.Key && x.StudentNo == paramDto.Password && x.StudentStatus == 1); .Join(_smartSportsContext.School, t => t.SchoolCode, s => s.SchoolCode, (t, s) => new
{
t.Id,
t.ParentPhoneNo,
t.StudentNo,
t.StudentName,
t.HomeAddress,
t.SchoolCode,
t.Sex,
t.Photo,
t.StudentStatus,
s.SchoolType
}).FirstOrDefaultAsync(x => x.StudentName == paramDto.Key && x.StudentNo == paramDto.Password && x.StudentStatus == 1);
if (parentUser == null) if (parentUser == null)
return null; return null;
if (parentUser.SchoolType == 1)
{
return new UserModelDataDto return new UserModelDataDto
{ {
PhoneNo = parentUser.ParentPhoneNo, PhoneNo = parentUser.ParentPhoneNo,
@ -183,6 +200,24 @@ namespace YD_WeChatApplet.Services
RelevanceId = Guid.NewGuid() RelevanceId = Guid.NewGuid()
}; };
} }
else
{
return new UserModelDataDto
{
PhoneNo = parentUser.ParentPhoneNo,
UserPwd = parentUser.StudentNo,
UserName = parentUser.StudentName,
UserTrueName = parentUser.StudentName,
Gender = parentUser.Sex,
HeadImageUrl = parentUser.Photo,
Address = parentUser.HomeAddress,
SchoolCode = parentUser.SchoolCode,
RoleName = "家长",
RoleId = 5,
RelevanceId = Guid.NewGuid()
};
}
}
private User CreateUserModel(UserModelDataDto userData) private User CreateUserModel(UserModelDataDto userData)
{ {