diff --git a/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs b/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs index 9392fbf..edd6cad 100644 --- a/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs +++ b/New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs @@ -241,7 +241,7 @@ namespace New_College.Api.Controllers UId = request.Uid, LowScore = c.LowScore, LowScoreRank = c.LowScoreRank, - AvgScore = c.AvgScore, + AvgScore = c.AvgScore != "-" ? int.Parse(c.AvgScore) <= c.LowScore ? "-" : c.AvgScore : "-", Years = c.Years, FirstType = c.FirstType, HighScore = c.HighScore, diff --git a/New_College.Api/Controllers/Front/NewsInfoController.cs b/New_College.Api/Controllers/Front/NewsInfoController.cs index acb3aed..e5ff98b 100644 --- a/New_College.Api/Controllers/Front/NewsInfoController.cs +++ b/New_College.Api/Controllers/Front/NewsInfoController.cs @@ -108,7 +108,8 @@ namespace New_College.Api.Controllers.Front CreateTime = s.CreateTime.Value, Id = s.Id, Summary = !string.IsNullOrWhiteSpace(s.Summary) ? s.Summary : s.Detail.Substring(0, 200) + "...", - Title = s.Title + Title = s.Title, + Source = s.Author }).ToList(); pageresponse.pageCount = pageinfo.data.Count; pageresponse.page = pageinfo.data.Count; diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index dd2679d..5abf541 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -290,7 +290,7 @@ namespace New_College.Repository }); return new PageModel() { - data = recommendInfo, + data = recommendInfo.OrderBy(o => o.Percentage).ToList(), page = query.PageIndex, PageSize = query.PageSize, dataCount = totalNumber,