From c9bcd672c90af292ed5ef81b5619fe9493daec80 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Thu, 7 Dec 2023 07:59:21 +0100 Subject: [PATCH 1/2] refs #6028 add:email in ByWorker --- modules/route/back/methods/route/filter.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/route/back/methods/route/filter.js b/modules/route/back/methods/route/filter.js index afefa77d1..ea2f0533e 100644 --- a/modules/route/back/methods/route/filter.js +++ b/modules/route/back/methods/route/filter.js @@ -130,13 +130,15 @@ module.exports = Self => { am.name agencyName, u.name AS workerUserName, v.numberPlate AS vehiclePlateNumber, - Date_format(r.time, '%H:%i') hour + Date_format(r.time, '%H:%i') hour, + eu.email FROM route r LEFT JOIN agencyMode am ON am.id = r.agencyModeFk LEFT JOIN agency a ON a.id = am.agencyFk LEFT JOIN vehicle v ON v.id = r.vehicleFk LEFT JOIN worker w ON w.id = r.workerFk - LEFT JOIN account.user u ON u.id = w.id` + LEFT JOIN account.user u ON u.id = w.id + LEFT JOIN account.emailUser eu ON eu.userFk = r.workerFk` ); stmt.merge(conn.makeSuffix(filter)); From 0263d880caec8672234a3e90b4a3fb71981b6f7c Mon Sep 17 00:00:00 2001 From: sergiodt Date: Thu, 7 Dec 2023 08:00:17 +0100 Subject: [PATCH 2/2] refs #6028 add:email in ByWorker --- modules/route/back/methods/route/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/route/back/methods/route/filter.js b/modules/route/back/methods/route/filter.js index ea2f0533e..7c2225dc9 100644 --- a/modules/route/back/methods/route/filter.js +++ b/modules/route/back/methods/route/filter.js @@ -138,7 +138,7 @@ module.exports = Self => { LEFT JOIN vehicle v ON v.id = r.vehicleFk LEFT JOIN worker w ON w.id = r.workerFk LEFT JOIN account.user u ON u.id = w.id - LEFT JOIN account.emailUser eu ON eu.userFk = r.workerFk` + LEFT JOIN account.emailUser eu ON eu.userFk = r.workerFk` ); stmt.merge(conn.makeSuffix(filter));