Forráskód Böngészése

退回校验是否特提处理

田爽 5 hónapja
szülő
commit
b12347824c

+ 1 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -4440,7 +4440,7 @@ public class OrderController : BaseController
             if (sendBack)
                 throw UserFriendlyException.SameMessage("当前工单已经生成退回记录");
 
-            var specialAny = await _orderSpecialRepository.Queryable().Where(x => x.OrderId == dto.OrderId && x.State == 0)
+            var specialAny = await _orderSpecialRepository.Queryable().Where(x => x.OrderId == order.OrderId && x.State == 0)
                 .AnyAsync();
             if (specialAny) throw UserFriendlyException.SameMessage("工单已存在待审批特提信息!");
             if (order.Workflow.IsInCountersign) throw UserFriendlyException.SameMessage("工单会签中,无法进行退回!");

+ 1 - 1
src/Hotline.Application/Orders/OrderApplication.cs

@@ -3116,7 +3116,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
              //.OrderBy(d => d.Status)
              .OrderByIF(dto.IsHandled == true, d => d.StartTime, OrderByType.Desc)
             //.OrderByIF(dto.IsHandled == false, d => new { IsUrgent = d.IsUrgent }, OrderByType.Desc)
-            .OrderByIF(dto.IsHandled == false, d => new { d.Status })
+            //.OrderByIF(dto.IsHandled == false, d => new { d.Status })
             .OrderByIF(dto.IsHandled == false && string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc)
             .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, d => d.CreationTime, OrderByType.Asc) //创建时间升序
             .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, d => d.CreationTime, OrderByType.Desc) //创建时间降序