diff --git a/New_College.Api/Controllers/Front/LibraryController.cs b/New_College.Api/Controllers/Front/LibraryController.cs index 084560b..13810d3 100644 --- a/New_College.Api/Controllers/Front/LibraryController.cs +++ b/New_College.Api/Controllers/Front/LibraryController.cs @@ -90,7 +90,7 @@ namespace New_College.Api.Controllers.Front Count = query[i].Count, Province = query[i].Province, Score = query[i].Score, - SumCount = query[i].SumCount, + SumCount =i==0 ? query[i].SumCount: query[i].SumCount - query[i - 1].SumCount, Type = query[i].Type, ScoreRegion = i == 0 ? "1~" + query[i].SumCount : query[i - 1].SumCount + 1 + "~ " + query[i].SumCount, Years = query[i].Years, diff --git a/New_College.Api/Controllers/OAuthController.cs b/New_College.Api/Controllers/OAuthController.cs index c41e757..8dcad19 100644 --- a/New_College.Api/Controllers/OAuthController.cs +++ b/New_College.Api/Controllers/OAuthController.cs @@ -29,10 +29,13 @@ namespace New_College.Controllers + /// - ///Oauth2验证回调 + /// Oauth2验证回调 /// /// + /// + /// /// [HttpGet] [Route("callback")] diff --git a/New_College.Api/New_College.xml b/New_College.Api/New_College.xml index bc9201f..c13dce0 100644 --- a/New_College.Api/New_College.xml +++ b/New_College.Api/New_College.xml @@ -1282,11 +1282,13 @@ - + Oauth2验证回调 - - - + + + + + diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 3028200..f5bdf1b 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -123,7 +123,7 @@ namespace New_College.Services .AndIF(query.Nhef.HasValue, x => x.Nhef == query.Nhef) .AndIF(query.Sff.HasValue, x => x.Sff == query.Sff) .AndIF(query.Syl.HasValue, x => x.Syl == query.Syl) - .AndIF(!string.IsNullOrWhiteSpace(query.Name), u => SqlFunc.Contains(query.Name, u.Name)) + .AndIF(!string.IsNullOrWhiteSpace(query.Name), u => SqlFunc.Contains(u.Name, query.Name)) .ToExpression(); var info = await d_UniversityRepository.QueryPage(expression, query.PageIndex, query.PageSize, "Rank Asc");