修改课程取消发布、停用逻辑

Tiobon.Core.Services/CommonServices.cs

@@ -2083,7 +2083,9 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                           AND B.RoleNo = 'F_TrainPlanTransferToConfirmed'";
                 toolbarRoles = DbAccess.QueryList<ToolbarRole>(sql);
                 if (toolbarRoles != null && toolbarRoles.Any())
-                    result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+                {
+                    index = result.JM_PageControlT1.Toolbar.FindIndex(x => x.fnKey == "NewYN");
+                    result.JM_PageControlT1.Toolbar.Insert(index + 1, new Toolbar()
                     {
                         display = true,
                         fnKey = "TBD5YN",
@@ -2092,6 +2094,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                         icon = "ghr-icon-user-wait",
                         position = "left"
                     });
+                }
                 break;
             case "F_TrainPlan_WaitConfirm":
                 result.JM_PageControlT1.Toolbar.Insert(0, new Toolbar()