Merge branch 'master' of http://git.tiobon.com/Simon/Tiobon.Web.Core

Tiobon.Core.Services/CommonServices.cs

@@ -2445,6 +2445,20 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 if (toolbar != null) toolbar.fnKey = "TBD2YN";
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault();
                 if (toolbar != null) toolbar.fnKey = "TBD3YN";
+                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault();
+                if (toolbar != null) toolbar.fnKey = "TBD4YN";
+
+                if(param.menuName == "F_GhraStaffGroup")
+                    result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+                    {
+                        display = true,
+                        fnKey = "TBD5YN",
+                        fnTitle = "人员",
+                        fnType = "row",
+                        icon = "ghr-preview",
+                        position = "left"
+                    });
+
                 break;
             case "F_PerformancePeriod":
                 result.JM_PageControlT1.Toolbar.Insert(0, new Toolbar()

Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs

@@ -141,7 +141,7 @@ namespace Tiobon.Core.Services
             });
             return ServiceResult<object>.OprateSuccess("查询成功！", result);
         }
-
+ 
         public class StaffInfoColumn()
         {
             public string StaffInfoColumnNo { get; set; }