diff --git a/server/routers/dry-wash/arm-master.js b/server/routers/dry-wash/arm-master.js index 9c61f10..7e95334 100644 --- a/server/routers/dry-wash/arm-master.js +++ b/server/routers/dry-wash/arm-master.js @@ -16,10 +16,9 @@ router.post("/masters/list", async (req, res, next) => { const masters = await MasterModel.find({}); const orders = await OrderModel.find({ - startWashTime: { - $gte: start, - $lt: end, - }, + $or: [ + { startWashTime: { $lt: end }, endWashTime: { $gt: start } } + ] }); const mastersWithOrders = masters.map((master) => {