diff --git a/WeChatApplet/Services/Impl/UserService.cs b/WeChatApplet/Services/Impl/UserService.cs index f3b8c2e..25fdccf 100644 --- a/WeChatApplet/Services/Impl/UserService.cs +++ b/WeChatApplet/Services/Impl/UserService.cs @@ -162,26 +162,61 @@ namespace YD_WeChatApplet.Services private async Task 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 - .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) return null; - return new UserModelDataDto + if (parentUser.SchoolType == 1) { - 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 = 3, - RelevanceId = Guid.NewGuid() - }; + 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 = 3, + 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)