diff --git a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs index b945074..3565e5f 100644 --- a/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs +++ b/New_College.Repository/BASE/T_EnrollmentPlanedescRepository.cs @@ -233,8 +233,22 @@ namespace New_College.Repository } if (majornames.Any() && majornames.Count() > 0) { + sqlstr.Append(" and ("); + int orcount = 0; + majornames.ForEach(a => + { + orcount++; + if (orcount == majornames.Count) + { + sqlstr.AppendFormat(" MajorName like '%{0}%' ", a); + } + else + { + sqlstr.AppendFormat(" MajorName like '%{0}%' or", a); + } - sqlstr.AppendFormat(" and MajorName in ('{0}')", string.Join("','", majornames)); + }); + sqlstr.Append(") "); } if (!string.IsNullOrWhiteSpace(query.SubjectClaim)) { @@ -282,7 +296,7 @@ namespace New_College.Repository ulist.Add(new UniversityEnrollmentPlanResult() { Logo = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName) != null ? universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Logo : "", - UniversityId = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName) != null ? universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Id : 0, + UniversityId = universitytemps.FirstOrDefault(e => e.Name == s.UniversityName) != null ? universitytemps.FirstOrDefault(e => e.Name == s.UniversityName).Id : 0, AreaName = recommendFirstModel.Province, UniversityCode = recommendFirstModel.EnrollmentCode, Rank = recommendFirstModel.UniversityRank, @@ -303,7 +317,7 @@ namespace New_College.Repository } }); - + return new MessageModel>() { success = true,