From 2234cef1b3a8d5a73b9653f6d6332fdf23e0ca22 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 24 Mar 2025 11:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BE=E7=A8=8B=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=9C=BA=E6=99=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_CourseServices.cs               | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
index 5e8e2fd2..4dc6faf4 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
@@ -161,6 +161,11 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
                 courseSceneIds = courseSceneIds.Concat(JsonConvert.DeserializeObject<List<long>>(x)).ToList();
 
         });
+        data.ForEach(x =>
+        {
+            if (x.CourseSceneId != null)
+                courseSceneIds.Add(x.CourseSceneId.Value);
+        });
         courseSceneIds = courseSceneIds.Distinct().ToList();
         var courseScenes = await Db.Queryable<Ghre_CourseScene>().Where(x => courseSceneIds.Contains(x.Id)).ToListAsync();
 
@@ -172,11 +177,23 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
             x.IsOPenLabel = x.IsOpen == "1" ? "是" : "否";
             var courseClass = classs.Where(a => x.CourseClassId.Contains(a.Id.ToString())).ToList();
             x.CourseClassName = string.Join(",", courseClass.Select(a => a.ClassName + " (" + a.ClassNo + ")"));
+
             if (x.CourseSceneIds.IsNotEmptyOrNull())
             {
-                var courseScene = courseScenes.Where(a => x.CourseSceneIds.Contains(a.Id.ToString())).ToList();
+                x.CourseSceneIds1 = JsonConvert.DeserializeObject<List<long>>(x.CourseSceneIds);
+                if (x.CourseSceneIds1.Any())
+                {
+                    var courseScene = courseScenes.Where(a => x.CourseSceneIds1.Contains(a.Id)).ToList();
+                    x.CourseSceneName = string.Join(",", courseScene.Select(a => a.SceneName + " (" + a.SceneNo + ")"));
+                }
+            }
+
+            else if (x.CourseSceneId != null)
+            {
+                var courseScene = courseScenes.Where(a => a.Id == x.CourseSceneId).ToList();
                 x.CourseSceneName = string.Join(",", courseScene.Select(a => a.SceneName + " (" + a.SceneNo + ")"));
             }
+
         });
 
         return new ServicePageResult<Ghre_CourseDto>(filter.pageNum, totalCount, filter.pageSize, data);