Merge branch 'dev' into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
7f43a45955
|
@ -41,15 +41,16 @@ module.exports = Self => {
|
|||
}
|
||||
|
||||
const stmt = new ParameterizedSQL(`
|
||||
SELECT *
|
||||
SELECT *
|
||||
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
|
||||
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`);
|
||||
|
||||
stmt.merge(conn.makeSuffix(filter));
|
||||
|
||||
return conn.executeStmt(stmt);
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue