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

getleaves fix
gitea/salix/dev This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-09-13 13:26:50 +02:00
parent a25652293d
commit a529efc783
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/agency/back/methods/zone-geo/getLeaves.js
View File

@ -31,7 +31,7 @@ module.exports = Self => {
} }
}); });
Self.getLeaves = async(zoneFk, parentFk, filter) => { Self.getLeaves = async(zoneFk, parentFk = null, filter) => {
let conn = Self.dataSource.connector; let conn = Self.dataSource.connector;
let stmts = []; let stmts = [];
@ -78,20 +78,19 @@ module.exports = Self => {
ON zg.lft <= ch.lft AND zg.rgt >= ch.rgt ON zg.lft <= ch.lft AND zg.rgt >= ch.rgt
UNION ALL UNION ALL
SELECT SELECT
child.id, zg.id,
child.name, zg.name,
child.lft, zg.lft,
child.rgt, zg.rgt,
child.depth, zg.depth,
child.sons, zg.sons,
zi.isIncluded AS selected zi.isIncluded AS selected
FROM zoneGeo parent FROM zoneGeo zg
JOIN zoneGeo child ON child.lft > parent.lft LEFT JOIN zoneIncluded zi ON zi.geoFk = zg.id
AND child.rgt < parent.rgt
AND child.depth = parent.depth + 1
LEFT JOIN zoneIncluded zi ON zi.geoFk = child.id
AND zi.zoneFk = ? AND zi.zoneFk = ?
WHERE parent.id = ?) AS nst`, [zoneFk, parentFk]); WHERE (? IS NULL AND zg.parentFk IS NULL)
OR (? IS NOT NULL AND zg.parentFk = ?)) AS nst`,
[zoneFk, parentFk, parentFk, parentFk]);
// Get nodes from depth greather than Origin // Get nodes from depth greather than Origin
stmt.merge(conn.makeSuffix(filter)); stmt.merge(conn.makeSuffix(filter));