修复 排除无就读情况的学生
This commit is contained in:
parent
a39fa1b34f
commit
f80ace8af8
|
|
@ -96,7 +96,7 @@ namespace Learn.Archives.API.Controllers
|
||||||
c.GradeLevel == gradeInfo.GradeLevel &&
|
c.GradeLevel == gradeInfo.GradeLevel &&
|
||||||
c.GraduationYear == gradeInfo.GradeYear &&
|
c.GraduationYear == gradeInfo.GradeYear &&
|
||||||
u.UserType == UserTypeEnum.学生.GetHashCode() &&
|
u.UserType == UserTypeEnum.学生.GetHashCode() &&
|
||||||
s.Enable && p.Enable && p.Enable && pr.Status == PositionRelationStatusEnum.就读任职 &&
|
s.Enable && p.Enable && pr.Enable && pr.Status == PositionRelationStatusEnum.就读任职 &&
|
||||||
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
|
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
|
||||||
.Select((s, c, p, pr, u) => new
|
.Select((s, c, p, pr, u) => new
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -380,7 +380,7 @@ namespace Learn.Archives.API.Controllers
|
||||||
s.Id == schoolId &&
|
s.Id == schoolId &&
|
||||||
u.UserType == UserTypeEnum.学生.GetHashCode() &&
|
u.UserType == UserTypeEnum.学生.GetHashCode() &&
|
||||||
batch.Contains(u.RealName) &&
|
batch.Contains(u.RealName) &&
|
||||||
s.Enable && p.Enable && pr.Enable &&
|
s.Enable && p.Enable && pr.Enable && pr.Status == PositionRelationStatusEnum.就读任职&&
|
||||||
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
|
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
|
||||||
.Select((s, c, p, pr, u) => new
|
.Select((s, c, p, pr, u) => new
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue