|
|
@ -101,12 +101,13 @@ namespace CK.SCP.Controller |
|
|
|
if (p_entity.UserInAddress != null && p_entity.UserInAddress.Count > 0) |
|
|
|
{ |
|
|
|
q = q.Where(p => p_entity.UserInAddress.Contains(p.Site)); |
|
|
|
} |
|
|
|
if (p_entity.ShipTimeStart != null && !p_entity.ShipTimeStart.ToString().Contains("0001/1/1")) |
|
|
|
} |
|
|
|
|
|
|
|
if (p_entity.ShipTimeStart != null && !p_entity.ShipTimeStart.ToString("yyyy-M-d").Contains("0001-1-1")) |
|
|
|
{ |
|
|
|
q = q.Where(p => p.ShipTime >= p_entity.ShipTimeStart); |
|
|
|
} |
|
|
|
if (p_entity.ShipTimeEnd != null && !p_entity.ShipTimeEnd.ToString().Contains("0001/1/1")) |
|
|
|
if (p_entity.ShipTimeEnd != null && !p_entity.ShipTimeEnd.ToString("yyyy-M-d").Contains("0001-1-1")) |
|
|
|
{ |
|
|
|
q = q.Where(p => p.ShipTime <= p_entity.ShipTimeEnd); |
|
|
|
} |
|
|
|