quick fix
This commit is contained in:
parent
6ddd99a864
commit
82505b58d9
|
|
@ -15,7 +15,7 @@ const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid,
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const reportTypeJoin = `
|
const reportTypeJoin = `
|
||||||
${up.fk_report_type ? 'JOIN dbmaster.report_types AS rt ON up.fk_report_type = rt.id' : ''}
|
${up.fk_report_type ? 'LEFT JOIN dbmaster.report_types AS rt ON up.fk_report_type = rt.id' : ''}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const reportTypeDeletedCondition = `
|
const reportTypeDeletedCondition = `
|
||||||
|
|
@ -30,8 +30,8 @@ const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid,
|
||||||
p.name AS place_name,
|
p.name AS place_name,
|
||||||
p.uuid AS place_uuid${reportTypeFields}`}
|
p.uuid AS place_uuid${reportTypeFields}`}
|
||||||
FROM dbmaster.users_has_places AS up
|
FROM dbmaster.users_has_places AS up
|
||||||
JOIN dbmaster.users AS u ON up.fk_user = u.id
|
LEFT JOIN dbmaster.users AS u ON up.fk_user = u.id
|
||||||
JOIN dbmaster.places AS p ON up.fk_place = p.id
|
LEFT JOIN dbmaster.places AS p ON up.fk_place = p.id
|
||||||
${reportTypeJoin}
|
${reportTypeJoin}
|
||||||
WHERE up.created <= :now
|
WHERE up.created <= :now
|
||||||
AND (up.deleted > :now OR up.deleted IS NULL)
|
AND (up.deleted > :now OR up.deleted IS NULL)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue