verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge branch 'dev' into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Javier Segarra 2024-01-22 11:08:06 +00:00
parent 39453492a0 725c43c7e4
commit 7f43a45955
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/worker/back/methods/worker/search.js
View File

@ -43,13 +43,14 @@ module.exports = Self => {
const stmt = new ParameterizedSQL(` const stmt = new ParameterizedSQL(`
SELECT * SELECT *
FROM( FROM(
SELECT DISTINCT w.id, w.code, u.name, u.nickname, u.active, b.departmentFk SELECT w.id, w.code, u.name, u.nickname, u.active, wd.departmentFk
FROM worker w FROM worker w
JOIN account.user u ON u.id = w.id JOIN account.user u ON u.id = w.id
LEFT JOIN business b ON b.workerFk = w.id LEFT JOIN workerDepartment wd ON wd.workerFk = w.id
) w`); ) w`);
stmt.merge(conn.makeSuffix(filter)); stmt.merge(conn.makeSuffix(filter));
return conn.executeStmt(stmt); return conn.executeStmt(stmt);
}; };