From 2aa2423c3b63431954c2b35186c8356421718188 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Fri, 30 May 2025 09:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=8F=AD=E8=BD=AC=E5=85=A5=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=BA=A7=E7=94=9F=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E9=9B=86=E5=9B=A2=E6=95=B0=E6=8D=AE=E5=BD=92=E5=B1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_OpenClassServices.cs              | 17 +++++++++++++++--
 .../Ghre/Ghre_RequestServices.cs                |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
index 1e6b2cdf..611ad1cf 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
@@ -458,7 +458,8 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
                             ScoreRule = entity.ScoreRule,
                             StudyFinishedRule = entity.StudyFinishedRule,
                             IsViewResult = entity.IsViewResult,
-                            IsAfterViewResultRetake = entity.IsAfterViewResultRetake
+                            IsAfterViewResultRetake = entity.IsAfterViewResultRetake,
+                            DataBelongID = entity.DataBelongID,
                         };
                         var examId = await Db.Insertable(exam).ExecuteReturnSnowflakeIdAsync();
 
@@ -474,12 +475,24 @@ public class Ghre_OpenClassServices : BaseServices<Ghre_OpenClass, Ghre_OpenClas
                             {
                                 ExamNo = entity.OpenClassNo,
                                 ExamName = entity.OpenClassName,
+                                UseDefaultCoverImage = true,
                                 BeginTime = entity.ExamStartTime,
                                 EndTime = entity.ExamEndTime,
+                                Status = "Released",
                                 LinkType = entity.LinkType == "Course" ? "CourseId" : "CourseSceneId",
                                 CourseId = entity.LinkType == "Course" ? entity.LinkId : null,
                                 CourseSceneId = entity.LinkType == "CourseScene" ? entity.LinkId : null,
-                                ExamPaperId = entity.ExamPaperId
+                                ExamPaperId = entity.ExamPaperId,
+                                OpenClassId = entity.Id,
+                               IsRequireStudy = entity.IsRequireStudy,
+                                PlanId = entity.PlanId,
+                                OnlineScorePercentage = entity.OnlineScorePercentage,
+                                OfflineScorePercentage = entity.OfflineScorePercentage,
+                                ScoreRule = entity.ScoreRule,
+                                StudyFinishedRule = entity.StudyFinishedRule,
+                                IsViewResult = entity.IsViewResult,
+                                IsAfterViewResultRetake = entity.IsAfterViewResultRetake,
+                                DataBelongID = entity.DataBelongID,
                             })
                             .Where(it => it.Id == entity.ExamId)
                             .ExecuteCommandAsync();
diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
index 8e3714ed..a9c4dda9 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
@@ -308,7 +308,7 @@ FROM Ghre_Request A
                                              LEFT JOIN Ghro_Dept B ON A.DeptId = B.DeptID
                                              LEFT JOIN Ghra_Staff C ON A.ApplicantId = C.StaffID
                                              LEFT JOIN Ghro_Dept D ON C.DeptID = D.DeptID
-                                        WHERE A.IsEnable = 1) A {conditions}
+                                        WHERE A.IsEnable = 1 AND dbo.FUserDataBelongPriv ({App.User.ID}, A.DataBelongID, NULL) = 1) A {conditions}
                                   GROUP BY CourseName,
                                            YearMonth1,
                                            DeptName,
@@ -350,7 +350,7 @@ FROM Ghre_Request A
                                          LEFT JOIN Ghro_Dept B ON A.DeptId = B.DeptID
                                          LEFT JOIN Ghra_Staff C ON A.ApplicantId = C.StaffID
                                          LEFT JOIN Ghro_Dept D ON C.DeptID = D.DeptID
-                                    WHERE A.IsEnable = 1) A {conditions}
+                                    WHERE A.IsEnable = 1 AND dbo.FUserDataBelongPriv ({App.User.ID}, A.DataBelongID, NULL) = 1) A {conditions}
                               GROUP BY CourseName,
                                        YearMonth1,
                                        DeptName,