From 0c310923dfe288d0ab9a44d45480bafdc2e891be Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Wed, 19 Feb 2025 17:12:15 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=89=9B=E5=B0=BE]=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E9=9C=80=E6=B1=82=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Services/CommonServices.cs            | 6 ++++--
 Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index 62752ae1..8b5df98d 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -2059,11 +2059,13 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                     icon = "ghr-clear",
                     position = "left"
                 });
+                break;
+            case "F_StaffGroup":
                 result.JM_PageControlT1.Toolbar.Add(new Toolbar()
                 {
                     display = true,
-                    fnKey = "TBD6YN",
-                    fnTitle = "查看人员",
+                    fnKey = "TBD5YN",
+                    fnTitle = "人员",
                     fnType = "row",
                     icon = "ghr-preview",
                     position = "left"
diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
index eec562d9..0c8ccf45 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs
@@ -608,7 +608,7 @@ FROM Ghre_Request A
                CreateProg,
                DeptNo,
                StaffNo,
-               LastUpdateDate)
+               LastUpdateDate,TrainStaffId)
    SELECT A.Id,
           A.RequestSource,
           c.DeptName,
@@ -624,7 +624,12 @@ FROM Ghre_Request A
           '',
           c.DeptNo,
           d.StaffNo,
-          isnull (A.UpdateTime, A.CreateTime)
+          isnull (A.UpdateTime, A.CreateTime),
+    STUFF((
+        SELECT ',' + S.StaffNo
+        FROM OPENJSON(A.TrainStaffId) WITH (TrainStaffId INT '$') AS JsonData
+        INNER JOIN Ghra_Staff S ON JsonData.TrainStaffId = S.StaffID
+        FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS StaffNames
    FROM Ghre_Request A
         LEFT JOIN [120.26.205.42].[GhrUshio].[dbo].Ghre_GHR50Request B
            ON B.RequestID = A.Id