From 2b299fb70903c2130b08503b4a7a76835f543626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Tue, 5 Mar 2024 17:42:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Dtos/ProvideServices/UpsertOrderInput.cs | 1 +
.../Repositories/OrderRepository.cs | 17 ++++++++---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs
index 880c43a5..91ae6d11 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertOrderInput.cs
@@ -7,6 +7,7 @@ public class UpsertOrderInput : UpdateOrderInput
///
/// 客户id
///
+ [Required]
public int CustomId { get; set; }
}
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index 5647fc4a..b1bb6476 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
@@ -61,17 +61,16 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
public async Task> GetLinkedOrdersAsync(int orderId)
{
return await Context.Queryable()
- .LeftJoin((a, b) => a.Id == b.OrderId)
- .LeftJoin((a, b, c) => b.LinkOrderId == c.Id)
+ .LeftJoin((a, b) => a.LinkOrderId == b.Id)
.Where(a => a.OrderId == orderId)
- .Select((a, b, c) => new LinkedOrderVO
+ .Select((a, b) => new LinkedOrderVO
{
- OrderId = c.Id,
- OrderType = c.OrderType,
- OrderNo = c.OrderNo,
- SubSystemId = c.SubSystemId,
- IsPushCompleted = c.IsPushCompleted,
- CustomId = c.CustomId
+ OrderId = b.Id,
+ OrderType = b.OrderType,
+ OrderNo = b.OrderNo,
+ SubSystemId = b.SubSystemId,
+ IsPushCompleted = b.IsPushCompleted,
+ CustomId = b.CustomId
})
.ToListAsync();
}