Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m10s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m10s
This commit is contained in:
commit
f25cbce1d6
1 changed files with 13 additions and 5 deletions
|
|
@ -128,21 +128,29 @@ class CheckAuth {
|
||||||
privilege: "CHILD",
|
privilege: "CHILD",
|
||||||
};
|
};
|
||||||
} else if (privilege == "BROTHER") {
|
} else if (privilege == "BROTHER") {
|
||||||
|
const minLevel = node === 0 ? 0 : node - 1;
|
||||||
data = {
|
data = {
|
||||||
// root: node >= 0 ? [x.orgRootId] : null,
|
// root: node >= 0 ? [x.orgRootId] : null,
|
||||||
|
/*
|
||||||
root: node >= 0 ? [x.orgRootId] : null,
|
root: node >= 0 ? [x.orgRootId] : null,
|
||||||
child1: node >= 2 ? [x.orgChild1Id] : null,
|
child1: node >= 2 ? [x.orgChild1Id] : null,
|
||||||
child2: node >= 3 ? [x.orgChild2Id] : null,
|
child2: node >= 3 ? [x.orgChild2Id] : null,
|
||||||
child3: node >= 4 ? [x.orgChild3Id] : null,
|
child3: node >= 4 ? [x.orgChild3Id] : null,
|
||||||
|
*/
|
||||||
|
root: minLevel <= 0 ? [x.orgRootId] : null,
|
||||||
|
child1: minLevel <= 1 ? [x.orgChild1Id] : null,
|
||||||
|
child2: minLevel <= 2 ? [x.orgChild2Id] : null,
|
||||||
|
child3: minLevel <= 3 ? [x.orgChild3Id] : null,
|
||||||
|
child4: minLevel <= 4 ? [x.orgChild4Id] : null,
|
||||||
privilege: "BROTHER",
|
privilege: "BROTHER",
|
||||||
};
|
};
|
||||||
} else if (privilege == "NORMAL") {
|
} else if (privilege == "NORMAL") {
|
||||||
data = {
|
data = {
|
||||||
root: [x.orgRootId],
|
root: node == 0 ? [x.orgRootId] : null,
|
||||||
child1: [x.orgChild1Id],
|
child1: node == 1 ? [x.orgChild1Id] : null,
|
||||||
child2: [x.orgChild2Id],
|
child2: node == 2 ? [x.orgChild2Id] : null,
|
||||||
child3: [x.orgChild3Id],
|
child3: node == 3 ? [x.orgChild3Id] : null,
|
||||||
child4: [x.orgChild4Id],
|
child4: node == 4 ? [x.orgChild4Id] : null,
|
||||||
privilege: "NORMAL",
|
privilege: "NORMAL",
|
||||||
};
|
};
|
||||||
} else if (privilege == "SPECIFIC") {
|
} else if (privilege == "SPECIFIC") {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue