From 3c7ef95cbfe37ede9060d563a0e4db99ba12104d Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Fri, 25 Apr 2025 15:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E8=BF=9E=E9=80=9A=E3=80=90=E5=B2=97?=
 =?UTF-8?q?=E4=BD=8D=E7=9F=A9=E9=98=B5=E3=80=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_TitleSkill_BoltoneServices.cs            |  9 ++++-----
 Tiobon.Core/Tiobon.Core.Model.xml                      | 10 ++++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
index 807a2e73..7375fc26 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_TitleSkill_BoltoneServices.cs
@@ -145,7 +145,8 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
                 i++;
             });
             condition += ")";
-        }else
+        }
+        else
             condition += $" AND 1!=1";
 
         var result2 = await _staffServices.QueryFilterPage(filter, condition);
@@ -166,9 +167,7 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
         {
             var column = result2.result.DT_TableDataT1[i];
 
-            var reverse16 = column.Reverse16;
-            if (reverse16.IsNotEmptyOrNull())
-                reverse16 = await GetParaLabel(reverse16.ObjToInt());
+            column.Reverse16 = await GetParaLabel("R09", column.Reverse16);
 
             var item1 = new JObject
             {
@@ -177,7 +176,7 @@ public class Ghre_TitleSkill_BoltoneServices : BaseServices<Ghre_TitleSkill_Bolt
                 new JProperty("IndateLabel",  column.IndateLabel),
                 new JProperty("StaffNo",  column.StaffNo),
                 new JProperty("StaffName",  column.StaffName),
-                new JProperty("StaffType1Label",  reverse16),
+                new JProperty("StaffType1Label",  column.Reverse16),
                 new JProperty("TitleName",  column.TitleName),
             };
             //×	生手 技能有效期内所对应课程还未分配或课程学习时长为0							
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index bdbaab0d..c18f8ae7 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -7150,6 +7150,11 @@
             系统内置
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_RequestBase.OutSideOrg">
+            <summary>
+            外训机构
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourseBase">
             <summary>
             必选修查询 (Dto.Base)
@@ -25527,6 +25532,11 @@
             系统内置
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_Request.OutSideOrg">
+            <summary>
+            外训机构
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_RequiredCourse">
             <summary>
             必选修查询 (Model)