From 0effd5dc295cb1ee23348b0ee8b407f4237a6867 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 27 May 2025 13:57:32 +0800
Subject: [PATCH] =?UTF-8?q?ESS=E5=85=AC=E5=BC=80=E8=AF=BE=E3=80=81?=
 =?UTF-8?q?=E5=BF=85=E4=BF=AE=E3=80=81=E9=80=89=E4=BF=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs      | 8 ++++++++
 Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
index 03df985a..5d4765f8 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
@@ -1230,6 +1230,14 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
                     continue;
                 }
 
+                if (name == "KeyWords")
+                {
+                    var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
+                    conditions += $" AND CourseName LIKE '%{jsonParam.columnValue}%' ";
+
+                    continue;
+                }
+
                 if (!string.IsNullOrWhiteSpace(value))
                 {
                     var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index 48810cb3..4ff843db 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -976,7 +976,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                     var value = jProperty.Value.ToString();
                     if (name == "page" || name == "pageSize")
                         continue;
-                    if (name == "CourseNoOrName")
+                    if (name == "CourseNoOrName" || name == "KeyWords")
                     {
                         var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
                         conditions += $" AND CourseName LIKE '%{jsonParam.columnValue}%'";
@@ -998,7 +998,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
                         conditions += $" AND {name} LIKE '%{jsonParam.columnValue}%'";
 
                         continue;
-                    }
+                    } 
 
                     if (name == "CourseStatus")
                     {
@@ -1216,7 +1216,7 @@ WHERE A.Status !='Temporary' AND A.Status !='Close' AND A.IsEnable=1 AND   (   E
                 var value = jProperty.Value.ToString();
                 if (name == "page" || name == "pageSize")
                     continue;
-                if (name == "CourseNoOrName")
+                if (name == "CourseNoOrName" || name == "KeyWords")
                 {
                     var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
                     conditions += $" AND CourseName LIKE '%{jsonParam.columnValue}%'";