首次查询标识

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -173,7 +173,7 @@ namespace Myshipping.Application
             var etoday = DateTime.Now.AddDays(15);
             //List<long> 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))

Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs

@@ -17,7 +17,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 首次查询标识
         /// </summary>
-        public virtual bool firstFlag { get; set; } = true;
+        public virtual bool firstFlag { get; set; } = false;
 
         /// <summary>
         /// 第三方系统编号