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

7837-testToMaster_2432 #2834

Merged
alexm merged 161 commits from 7837-testToMaster_2432 into master 2024-08-06 05:52:05 +00:00
Conversation 0 Commits 161 Files Changed 147 +1
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1a3ed42bcd - Show all commits

1
modules/client/back/methods/defaulter/filter.js
View File

@ -85,6 +85,7 @@ module.exports = Self => {
LEFT JOIN ( LEFT JOIN (
SELECT MAX(started), clientFk, finished SELECT MAX(started), clientFk, finished
FROM recovery FROM recovery
GROUP BY clientFk
) r ON r.clientFk = c.id ) r ON r.clientFk = c.id
LEFT JOIN workerDepartment wd ON wd.workerFk = u.id LEFT JOIN workerDepartment wd ON wd.workerFk = u.id
JOIN department dp ON dp.id = wd.departmentFk JOIN department dp ON dp.id = wd.departmentFk