marking
/
Learn.Archives
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Merge pull request 'dev' (#57) from dev into master 

Reviewed-on: #57
This commit is contained in:
hy 2026-04-21 16:49:00 +08:00
parent bf8fb54aa2 f80ace8af8
commit f48413eb50
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Learn.Archives.API/Controllers/ExamClassInfoController.cs
View File

@ -96,7 +96,7 @@ namespace Learn.Archives.API.Controllers
c.GradeLevel == gradeInfo.GradeLevel &&
c.GraduationYear == gradeInfo.GradeYear &&
u.UserType == UserTypeEnum.学生.GetHashCode() &&
s.Enable && p.Enable && pr.Enable &&
s.Enable && p.Enable && pr.Enable && pr.Status == PositionRelationStatusEnum.就读任职 &&
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
.Select((s, c, p, pr, u) => new
{

10
Learn.Archives.API/Controllers/StudentController.cs
View File

@ -380,7 +380,7 @@ namespace Learn.Archives.API.Controllers
s.Id == schoolId &&
u.UserType == UserTypeEnum.学生.GetHashCode() &&
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)
.Select((s, c, p, pr, u) => new
{
@ -498,7 +498,14 @@ namespace Learn.Archives.API.Controllers
}, ex => { throw ex; });
}
//写入选科方向
userCenterUpdate = userCenterUpdate.Where(s =>
new object[] { s.Phone,
s.GLSubject,
s.GSubject1,
s.GSubject2,}
.Any(x => !(x == default || x == null))).ToList();
if (userCenterUpdate.Count > 0)
{
await userService.AsUpdateable(userCenterUpdate)
.UpdateColumns(s => new
{
@ -511,6 +518,7 @@ namespace Learn.Archives.API.Controllers
.IgnoreColumns(ignoreAllNullColumns: true, ignoreAllDefaultValue: true)
.WhereColumns(it => new { it.Id })
.ExecuteCommandAsync();
}
return Ok();
}