From 2aab1d8c9429482b360be91bddb4a4676e019db1 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 28 Apr 2025 11:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AF=E4=BA=9A=E5=A8=81=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs   | 6 ++++--
 Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs | 5 +----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
index cb0c0191..baf46165 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
@@ -801,6 +801,8 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
     {
         var input = new DefaultGhre_ExamInput();
 
+        var companyCode = await QueryCompanyCode();
+
         #region baseColumns
         var baseColumns = new List<DefaultGhre_ExamColumn>
         {
@@ -959,7 +961,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 label = "学习完成规则",
                 field = "StudyFinishedRule",
                 elementType = "ApiSelect",
-                required = true,
+                required= companyCode == "Viavi"?false: true,
                 multipleSelect = false,
                 editable = true,
                 dataSource = "TBParaDetail_Train_TrainStudyFinishedRule"
@@ -993,7 +995,6 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
             }
         };
 
-        var companyCode = await QueryCompanyCode();
         if (companyCode == "Viavi")
             baseColumns = baseColumns.Where(x => x.field != "ExamMode1").ToList();
         #endregion
@@ -1071,6 +1072,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
             var staffTableData = await QueryStaff1(Id);
             pageData.staffTableData = staffTableData.Data;
         }
+        else input.pageData.ScoreRule = "Highest";
         #endregion
 
         input.baseColumns = baseColumns;
diff --git a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
index 26291f7c..2973909e 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_SurveyServices.cs
@@ -1,7 +1,4 @@
-using SqlSugar.Extensions;
-using Tiobon.Core.IServices;
-
-namespace Tiobon.Core.Services;
+namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 问卷调查 (服务)