diff --git a/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs b/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs index d9ab33b..0292119 100644 --- a/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs +++ b/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs @@ -281,6 +281,7 @@ namespace New_College.Api.Controllers Expression> expression = Expressionable.Create() .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,