dev #57

Merged
hy merged 3 commits from dev into master 2026-04-21 16:49:01 +08:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit f80ace8af8 - Show all commits

View File

@ -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
{ {

View File

@ -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
{ {