From cc91836c67609ec8820de051027a2e46b206bb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= Date: Fri, 22 Nov 2024 10:29:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=8D=95=E5=8F=B7=E5=92=8C=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=95=86code=E6=89=BE=E4=B8=8D=E5=88=B0=E4=B8=BB=E5=8D=95?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update: 剔除删除轨迹页面轨迹下拉列表的的筛选 --- .../Services/TrackContents/TrackContentService.cs | 6 ------ src/SJZY.Track.Repository/Repositories/OrderRepository.cs | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs index bdc6edab..8cb91e48 100644 --- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs +++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs @@ -269,12 +269,6 @@ public class TrackContentService : ApplicationService if (!item.IsAllowManuallyUpdate && input.TrackOptionType == TrackOptionType.修改) //跳过不允许手动创建的轨迹内容 continue; - if (!item.IsRepeatable && input.TrackOptionType == TrackOptionType.删除) //删除操作中跳过不重复的轨迹内容 - continue; - - if (!item.IsAllowManuallyCreate && input.TrackOptionType == TrackOptionType.删除) //删除操作中跳过不允许手动创建的轨迹内容 - continue; - res.Data.Add(new GetAvailableContentOutput() { IsExternal = item.IsExternal, diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index 53f6c327..ec5f18fe 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -61,7 +61,7 @@ public class OrderRepository : BasicRepository, IOrderRepository, I public async Task<(int MainOrderId, int CustomId)> GetTrackOrderByProviderAndOrderNo(string serviceProvidrCode, string orderNo) { var orderList = await Context.Queryable() - .LeftJoin((a, b) => a.Id == b.OrderId && b.IsDeleted) + .LeftJoin((a, b) => a.Id == b.OrderId && b.IsDeleted == false) .Where((a, b) => a.OrderNo == orderNo || (b.Platform == serviceProvidrCode && b.OrderNumber == orderNo)) .Select((a, b) => new