部分BUG调整

OASystem/OASystem.Api/Controllers/TaskController.cs

@@ -83,12 +83,16 @@ namespace OASystem.API.Controllers
                     {
                         Active = x.Active,
                         ExtraActive = 1,
-                        Steps = taskArr.Where(x => x.IsExtraTask == false).Select(x => new Steps
+                        Steps = taskArr.Where(x => x.IsExtraTask == false)
+                        .OrderBy(x => x.Sort)
+                        .Select(x => new Steps
                         {
                             Id = x.Id,
                             Name = x.Name,
                         }).ToList(),
-                        ExtraStep = taskArr.Where(x => x.IsExtraTask == true).Select(x => new Steps
+                        ExtraStep = taskArr.Where(x => x.IsExtraTask == true)
+                        .OrderBy(x => x.Sort)
+                        .Select(x => new Steps
                         {
                             Id = x.Id,
                             Name = x.Name,
@@ -451,7 +455,9 @@ namespace OASystem.API.Controllers
                 try
                 {
                     var workOrderId = workOrder.Id;
-                    _sqlsugar.Updateable<Task_WorkOrder>(workOrder).ExecuteCommand();
+                    _sqlsugar.Updateable<Task_WorkOrder>(workOrder)
+                    .IgnoreColumns(x => new { x.CreateTime, x.CreateUserId })
+                    .ExecuteCommand();
                     List<Task_WorkTask> workTasks = dto.Tasks.Select(x => new Task_WorkTask
                     {
                         Id = x.Id,
@@ -487,7 +493,9 @@ namespace OASystem.API.Controllers
                     }
                     if (updateArr.Any())
                     {
-                        _sqlsugar.Updateable(updateArr).ExecuteCommand();
+                        _sqlsugar.Updateable(updateArr)
+                         .IgnoreColumns(x => new { x.CreateTime, x.CreateUserId })
+                         .ExecuteCommand();
                     }
 
                     _sqlsugar.CommitTran();