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

Compare commits

base: marking:f48413eb50ae43194e7b6d37e08b498e394ad379
Branches Tags
marking:master
marking:dev
marking:staging
..
compare: marking:bf8fb54aa2f9584a7ee3187d78677d47b18589df
Branches Tags
marking:master
marking:dev
marking:staging

No commits in common. "f48413eb50ae43194e7b6d37e08b498e394ad379" and "bf8fb54aa2f9584a7ee3187d78677d47b18589df" have entirely different histories.
f48413eb50 ... bf8fb54aa2

2 changed files with 2 additions and 10 deletions
Show Stats 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.GradeLevel == gradeInfo.GradeLevel &&
c.GraduationYear == gradeInfo.GradeYear && c.GraduationYear == gradeInfo.GradeYear &&
u.UserType == UserTypeEnum.学生.GetHashCode() && u.UserType == UserTypeEnum.学生.GetHashCode() &&
s.Enable && p.Enable && pr.Enable && pr.Status == PositionRelationStatusEnum.就读任职 && s.Enable && p.Enable && pr.Enable &&
!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
{ {

10
Learn.Archives.API/Controllers/StudentController.cs
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 && pr.Status == PositionRelationStatusEnum.就读任职&& s.Enable && p.Enable && pr.Enable &&
!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
{ {
@ -498,14 +498,7 @@ namespace Learn.Archives.API.Controllers
}, ex => { throw ex; }); }, 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) if (userCenterUpdate.Count > 0)
{
await userService.AsUpdateable(userCenterUpdate) await userService.AsUpdateable(userCenterUpdate)
.UpdateColumns(s => new .UpdateColumns(s => new
{ {
@ -518,7 +511,6 @@ namespace Learn.Archives.API.Controllers
.IgnoreColumns(ignoreAllNullColumns: true, ignoreAllDefaultValue: true) .IgnoreColumns(ignoreAllNullColumns: true, ignoreAllDefaultValue: true)
.WhereColumns(it => new { it.Id }) .WhereColumns(it => new { it.Id })
.ExecuteCommandAsync(); .ExecuteCommandAsync();
}
return Ok(); return Ok();
} }