diff --git a/VOL.Business/Services/School/S_TeacherService.cs b/VOL.Business/Services/School/S_TeacherService.cs index 8433d71..b2929a5 100644 --- a/VOL.Business/Services/School/S_TeacherService.cs +++ b/VOL.Business/Services/School/S_TeacherService.cs @@ -73,16 +73,16 @@ namespace VOL.Business.Services.School { var isTeacher = (UserContext.Current.RoleId == 3); - var list = await _teacherRepository.FindAsIQueryable(x => - x.SchoolCode.Equals(UserContext.Current.TenantId) && + var list = await _teacherRepository.FindAsIQueryable(x => + x.SchoolCode.Equals(UserContext.Current.TenantId) && x.TeacherStatus != TeacherStatus.Depart && (!isTeacher || x.TeacherPhoneNo == UserContext.Current.UserInfo.PhoneNo) ).Select(x => new TeacherNameModel() - { - Id = x.Id, - TeacherPhone = x.TeacherPhoneNo, - TeacherName = x.TeacherName - }).ToListAsync(); + { + Id = x.Id, + TeacherPhone = x.TeacherPhoneNo, + TeacherName = x.TeacherName + }).ToListAsync(); return list; } @@ -297,6 +297,9 @@ namespace VOL.Business.Services.School teacherEntity.CreateDate = DateTime.Now; teacherEntity.AppletPwd = "000000"; + var roleId = UserContext.Current.RoleId; + + using (var transaction = _teacherRepository.DbContext.Database.BeginTransaction()) { try @@ -308,7 +311,7 @@ namespace VOL.Business.Services.School var userEntity = new Sys_User() { - Role_Id = 3, + Role_Id = roleId == 2 ? 3 : 5, RoleName = "学校老师", PhoneNo = paramDto.TeacherPhoneNo, SchoolName = UserContext.Current.SchoolName, @@ -809,7 +812,7 @@ namespace VOL.Business.Services.School } float CalculatePassRate(int passed, int total) => total > 0 ? (float)Math.Truncate((double)passed / total * 100) / 100 : 0; - + // 获取所有班级的学生人数 var classStudentCounts = await ( from s in _classRepository.DbContext.Set()