宝连通【岗位矩阵】修改

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;
+            column.Reverse16 = await GetParaLabel("R09", column.Reverse16);
-            if (reverse16.IsNotEmptyOrNull())
-                reverse16 = await GetParaLabel(reverse16.ObjToInt());
 
             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							

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)