From ed77347fe1a92776d9c1de7137002b60b6be3522 Mon Sep 17 00:00:00 2001 From: jorgep Date: Thu, 25 Jan 2024 15:41:55 +0100 Subject: [PATCH 1/3] fix: #6557 replace procedure --- modules/worker/back/methods/worker/mySubordinates.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/worker/back/methods/worker/mySubordinates.js b/modules/worker/back/methods/worker/mySubordinates.js index b6711e382..540bb8551 100644 --- a/modules/worker/back/methods/worker/mySubordinates.js +++ b/modules/worker/back/methods/worker/mySubordinates.js @@ -30,13 +30,12 @@ module.exports = Self => { if (typeof options == 'object') Object.assign(myOptions, options); - stmts.push(new ParameterizedSQL('CALL vn.subordinateGetList(?)', [userId])); - const queryIndex = stmts.push('SELECT * FROM tmp.subordinate') - 1; - stmts.push('DROP TEMPORARY TABLE tmp.subordinate'); + stmts.push(new ParameterizedSQL('CALL vn.worker_getHierarchy(?)', [userId])); + const queryIndex = stmts.push('SELECT * FROM tmp.workerHierarchyList') - 1; + stmts.push('DROP TEMPORARY TABLE tmp.workerHierarchyList'); const sql = ParameterizedSQL.join(stmts, ';'); const result = await conn.executeStmt(sql, myOptions); - return result[queryIndex]; }; }; From cfe7fa0790be0d9e861fd618fba1ebec0806541e Mon Sep 17 00:00:00 2001 From: jorgep Date: Thu, 1 Feb 2024 08:52:05 +0100 Subject: [PATCH 2/3] refs #6703 try --- db/dump/fixtures.before.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql index 3803730bd..85e24f282 100644 --- a/db/dump/fixtures.before.sql +++ b/db/dump/fixtures.before.sql @@ -3067,3 +3067,4 @@ INSERT INTO `vn`.`clientSms` (`id`, `clientFk`, `smsFk`, `ticketFk`) (4, 1103, 4, 32), (13, 1101, 1, NULL), (14, 1101, 4, 27); + From bb91035b77c35a0d33cedd83bbeb42cce491d0c2 Mon Sep 17 00:00:00 2001 From: jorgep Date: Thu, 1 Feb 2024 08:52:40 +0100 Subject: [PATCH 3/3] refs #6703 try --- db/dump/fixtures.before.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql index 85e24f282..3803730bd 100644 --- a/db/dump/fixtures.before.sql +++ b/db/dump/fixtures.before.sql @@ -3067,4 +3067,3 @@ INSERT INTO `vn`.`clientSms` (`id`, `clientFk`, `smsFk`, `ticketFk`) (4, 1103, 4, 32), (13, 1101, 1, NULL), (14, 1101, 4, 27); -