diff --git a/Learn.Archives.API/Controllers/ExamClassInfoController.cs b/Learn.Archives.API/Controllers/ExamClassInfoController.cs index b93c4e9..18c23b3 100644 --- a/Learn.Archives.API/Controllers/ExamClassInfoController.cs +++ b/Learn.Archives.API/Controllers/ExamClassInfoController.cs @@ -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 { diff --git a/Learn.Archives.API/Controllers/StudentController.cs b/Learn.Archives.API/Controllers/StudentController.cs index a4d6d0f..27abbab 100644 --- a/Learn.Archives.API/Controllers/StudentController.cs +++ b/Learn.Archives.API/Controllers/StudentController.cs @@ -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(); }