bug fixed
parent
ebbc73074d
commit
128ab043f0
|
|
@ -90,7 +90,7 @@ namespace New_College.Api.Controllers.Front
|
||||||
Count = query[i].Count,
|
Count = query[i].Count,
|
||||||
Province = query[i].Province,
|
Province = query[i].Province,
|
||||||
Score = query[i].Score,
|
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,
|
Type = query[i].Type,
|
||||||
ScoreRegion = i == 0 ? "1~" + query[i].SumCount : query[i - 1].SumCount + 1 + "~ " + query[i].SumCount,
|
ScoreRegion = i == 0 ? "1~" + query[i].SumCount : query[i - 1].SumCount + 1 + "~ " + query[i].SumCount,
|
||||||
Years = query[i].Years,
|
Years = query[i].Years,
|
||||||
|
|
|
||||||
|
|
@ -29,10 +29,13 @@ namespace New_College.Controllers
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Oauth2验证回调
|
/// Oauth2验证回调
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="code"></param>
|
/// <param name="code"></param>
|
||||||
|
/// <param name="state"></param>
|
||||||
|
/// <param name="scope"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
[Route("callback")]
|
[Route("callback")]
|
||||||
|
|
|
||||||
|
|
@ -1286,6 +1286,8 @@
|
||||||
Oauth2验证回调
|
Oauth2验证回调
|
||||||
</summary>
|
</summary>
|
||||||
<param name="code"></param>
|
<param name="code"></param>
|
||||||
|
<param name="state"></param>
|
||||||
|
<param name="scope"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="T:New_College.Controllers.PermissionController">
|
<member name="T:New_College.Controllers.PermissionController">
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@ namespace New_College.Services
|
||||||
.AndIF(query.Nhef.HasValue, x => x.Nhef == query.Nhef)
|
.AndIF(query.Nhef.HasValue, x => x.Nhef == query.Nhef)
|
||||||
.AndIF(query.Sff.HasValue, x => x.Sff == query.Sff)
|
.AndIF(query.Sff.HasValue, x => x.Sff == query.Sff)
|
||||||
.AndIF(query.Syl.HasValue, x => x.Syl == query.Syl)
|
.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();
|
.ToExpression();
|
||||||
|
|
||||||
var info = await d_UniversityRepository.QueryPage(expression, query.PageIndex, query.PageSize, "Rank Asc");
|
var info = await d_UniversityRepository.QueryPage(expression, query.PageIndex, query.PageSize, "Rank Asc");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue