From 00b1822311f8efce945fd50f7add63e794945da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Tue, 26 Mar 2024 11:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BASE/T_EnrollmentPlanedescRepository.cs   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

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<PageModel<UniversityEnrollmentPlanResult>>()
             {
                 success = true,