diff --git a/New_College.Api/appsettings.json b/New_College.Api/appsettings.json index 37c2ef4..5a5fb8d 100644 --- a/New_College.Api/appsettings.json +++ b/New_College.Api/appsettings.json @@ -26,7 +26,7 @@ "Name": "New_College" } }, - "urls": "http://*:8083", // IIS 部署,注释掉 + "urls": "http://*:8082", // IIS 部署,注释掉 "AllowedHosts": "*", "AppSettings": { "RedisCachingAOP": { diff --git a/New_College.Model/ViewModels/Query/UniversityQuery.cs b/New_College.Model/ViewModels/Query/UniversityQuery.cs index 33244b5..160115d 100644 --- a/New_College.Model/ViewModels/Query/UniversityQuery.cs +++ b/New_College.Model/ViewModels/Query/UniversityQuery.cs @@ -12,7 +12,7 @@ namespace New_College.Model.ViewModels /// /// 学科层次 /// - public int SubjectLevel { get; set; } + public int? SubjectLevel { get; set; } /// /// 省市区名称 /// @@ -34,17 +34,17 @@ namespace New_College.Model.ViewModels /// /// 是否985 0、否,1、是 /// - public int Nhef { get; set; } = -1; + public int? Nhef { get; set; } /// /// 是否211 0、否,1、是 /// - public int Sff { get; set; } = -1; + public int? Sff { get; set; } /// /// 是否双一流 0、否,1、是 /// - public int Syl { get; set; } = -1; + public int? Syl { get; set; } } public class UniversityRankQuery diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs index 8c25e9b..9e9b7f2 100644 --- a/New_College.Services/D_LongIdMapServices.cs +++ b/New_College.Services/D_LongIdMapServices.cs @@ -113,14 +113,14 @@ namespace New_College.Services { Expression> expression = Expressionable.Create() .And(x => x.IsDelete == false) - .AndIF(query.AreaName.Any() && !query.AreaName.Contains("全国"), x => SqlFunc.ContainsArray(query.AreaName, x.Area_Name)) - .AndIF(query.Nature.Any(), x => SqlFunc.ContainsArray(query.Nature, x.Nature)) - .AndIF(query.Type.Any(), x => SqlFunc.ContainsArray(query.Type, x.Type)) - .AndIF(query.SubjectLevel > 0, x => x.Subject_Level == query.SubjectLevel) - .AndIF(query.Nhef > 0, x => x.Nhef == query.Nhef) - .AndIF(query.Sff > 0, x => x.Sff == query.Sff) - .AndIF(query.Syl > 0, x => x.Syl == query.Syl) - .AndIF(!string.IsNullOrWhiteSpace(query.Name), u => SqlFunc.Contains(query.Name, u.Name)) + .AndIF(query.AreaName!=null&& query.AreaName.Any() && !query.AreaName.Contains("全国"), x => SqlFunc.ContainsArray(query.AreaName, x.Area_Name)) + .AndIF(query.Nature != null && query.Nature.Any(), x => SqlFunc.ContainsArray(query.Nature, x.Nature)) + .AndIF(query.Nature != null && query.Type.Any(), x => SqlFunc.ContainsArray(query.Type, x.Type)) + .AndIF(query.SubjectLevel.HasValue, x => x.Subject_Level == query.SubjectLevel) + .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)) .ToExpression(); var info = await d_UniversityRepository.QueryPage(expression, query.PageIndex, query.PageSize, "Rank Asc");