From 3fd5601277489c5522c4578bb99992d4aafdb12e Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Mon, 20 Mar 2023 17:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=9F=A5=E8=AF=A2=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/BookingOrder/BookingOrderService.cs | 2 +- .../Service/BookingOrder/Dto/BookingOrderInput.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 532dc927..e4eedc21 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -173,7 +173,7 @@ namespace Myshipping.Application var etoday = DateTime.Now.AddDays(15); //List userlist = await DataFilterExtensions.GetDataScopeIdList(); var entities = await _rep.AsQueryable() - .WhereIF(input.firstFlag, x=>x.ETD<= etoday||x.ETD>=ftoday||x.ETD==null) + .WhereIF(input.firstFlag, x=>x.ETD<= etoday&&x.ETD>=ftoday||x.ETD==null) .WhereIF(string.IsNullOrWhiteSpace(input.HBLNO), x => x.ParentId == 0 || x.ParentId == null) .WhereIF(pidlist != null && pidlist.Count > 0, x => pidlist.Contains(x.Id)) .WhereIF(!string.IsNullOrWhiteSpace(input.BSNO), u => u.BSNO.Contains(input.BSNO)) diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs index 4902afc0..3e41fc0a 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs @@ -17,7 +17,7 @@ namespace Myshipping.Application /// /// 首次查询标识 /// - public virtual bool firstFlag { get; set; } = true; + public virtual bool firstFlag { get; set; } = false; /// /// 第三方系统编号