verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

Merge pull request 'Fix[WorkerFilter]: Fixed filter' (!3394) from Fix-WorkerFilterLimit into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #3394
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
This commit is contained in:
Jon Elias 2025-01-29 11:03:14 +00:00
parent 78842cd69c 1d53f2c490
commit 17b4089b51
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/worker/back/methods/worker/filter.js
View File

@ -166,12 +166,11 @@ module.exports = Self => {
LEFT JOIN account.emailUser eu ON eu.userFk = u.id` LEFT JOIN account.emailUser eu ON eu.userFk = u.id`
); );
stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeSuffix(filter));
stmts.push(stmt); let itemsIndex = stmts.push(stmt) - 1;
const itemsIndex = stmts.push(stmt) - 1; let sql = ParameterizedSQL.join(stmts, ';');
const sql = ParameterizedSQL.join(stmts, ';'); let result = await conn.executeStmt(sql);
const result = await conn.executeStmt(sql, myOptions); return itemsIndex === 0 ? result : result[itemsIndex];
return result[itemsIndex];
}; };
}; };