From 00ffc82f8d8a41753ce5c61c62c1fcd6254aa8de Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 1 Feb 2023 08:34:14 +0100 Subject: [PATCH] use CURDATE() in rawSQL --- modules/route/back/methods/route/updateWorkCenter.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/route/back/methods/route/updateWorkCenter.js b/modules/route/back/methods/route/updateWorkCenter.js index 75169ce7e8..7796fba412 100644 --- a/modules/route/back/methods/route/updateWorkCenter.js +++ b/modules/route/back/methods/route/updateWorkCenter.js @@ -33,13 +33,12 @@ module.exports = Self => { } try { - const date = Date.vnNew(); const [result] = await Self.rawSql(` SELECT IFNULL(wl.workCenterFk, r.defaultWorkCenterFk) AS commissionWorkCenter FROM vn.routeConfig r LEFT JOIN vn.workerLabour wl ON wl.workerFk = ? - AND ? BETWEEN wl.started AND IFNULL(wl.ended, ?); - `, [userId, date, date], myOptions); + AND CURDATE() BETWEEN wl.started AND IFNULL(wl.ended, CURDATE()); + `, [userId], myOptions); const route = await models.Route.findById(id, null, myOptions); await route.updateAttribute('commissionWorkCenterFk', result.commissionWorkCenter, myOptions);