feat:bug fixed

develop
old易 2024-06-17 17:12:23 +08:00
parent 14144129d8
commit fee655541e
1 changed files with 2 additions and 1 deletions

View File

@ -281,6 +281,7 @@ namespace New_College.Api.Controllers
Expression<Func<D_PlanMajorScoreLine, bool>> expression = Expressionable.Create<D_PlanMajorScoreLine>()
.And(c => c.UId == request.Uid)
.And(c => c.IsDelete == false)
.And(c=>!string.IsNullOrEmpty(c.SelectSubject))
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
.AndIF(request.Year.HasValue && request.Year > 0, c => c.Years == request.Year)
.ToExpression();
@ -291,7 +292,7 @@ namespace New_College.Api.Controllers
UId = request.Uid,
LowScore = c.LowScore,
LowScoreRank = c.LowScoreRank,
AvgScore = c.AvgScore != "-" ? int.Parse(c.AvgScore) <= c.LowScore ? "-" : c.AvgScore : "-",
AvgScore = c.AvgScore,
Years = c.Years,
FirstType = c.FirstType,
HighScore = c.HighScore,