แก้ไขสิทธิ์ PARENT ให้เห็นข้อมูลทั้งหมดทุกหน่วยงาน #54
This commit is contained in:
parent
8c2faf4b31
commit
e161335f36
2 changed files with 37 additions and 33 deletions
|
|
@ -161,7 +161,7 @@ export class EvaluationController {
|
|||
let nodeId = resolveNodeId(orgDna);
|
||||
let conditions: string[] = [];
|
||||
let params: any = {};
|
||||
if (_data.privilege === "CHILD" || _data.privilege === "PARENT" || _data.privilege === "BROTHER") {
|
||||
if (_data.privilege === "CHILD" || /*_data.privilege === "PARENT" ||*/ _data.privilege === "BROTHER") {
|
||||
if (_data.privilege === "CHILD") {
|
||||
|
||||
if (level === 0 && orgDna.rootDnaId) {
|
||||
|
|
@ -195,7 +195,8 @@ export class EvaluationController {
|
|||
params,
|
||||
};
|
||||
}
|
||||
} else if (_data.privilege === "BROTHER") {
|
||||
}
|
||||
else if (_data.privilege === "BROTHER") {
|
||||
const parentLevel = level !== null ? level - 1 : null;
|
||||
if (parentLevel != null && parentLevel === 0 && orgDna.rootDnaId) {
|
||||
conditions.push("evaluation.rootDnaId = :root");
|
||||
|
|
@ -223,36 +224,37 @@ export class EvaluationController {
|
|||
params,
|
||||
};
|
||||
}
|
||||
} else if (_data.privilege === "PARENT") {
|
||||
if (level === 0) {
|
||||
if (orgDna.rootDnaId) {
|
||||
conditions.push("evaluation.rootDnaId = :root");
|
||||
params.root = orgDna.rootDnaId;
|
||||
}
|
||||
} else if (level === 1) {
|
||||
if (orgDna.rootDnaId) {
|
||||
conditions.push("evaluation.rootDnaId = :root AND evaluation.child1DnaId IS NOT NULL");
|
||||
params.root = orgDna.rootDnaId;
|
||||
}
|
||||
} else if (level === 2) {
|
||||
conditions.push("evaluation.child1DnaId = :child1 AND evaluation.child2DnaId IS NOT NULL");
|
||||
params.child1 = orgDna.child1DnaId;
|
||||
} else if (level === 3) {
|
||||
conditions.push("evaluation.child2DnaId = :child2 AND evaluation.child3DnaId IS NOT NULL");
|
||||
params.child2 = orgDna.child2DnaId;
|
||||
} else if (level === 4) {
|
||||
conditions.push("evaluation.child3DnaId = :child3 AND evaluation.child4DnaId IS NOT NULL");
|
||||
params.child3 = orgDna.child3DnaId;
|
||||
}
|
||||
}
|
||||
// else if (_data.privilege === "PARENT") {
|
||||
// if (level === 0) {
|
||||
// if (orgDna.rootDnaId) {
|
||||
// conditions.push("evaluation.rootDnaId = :root");
|
||||
// params.root = orgDna.rootDnaId;
|
||||
// }
|
||||
// } else if (level === 1) {
|
||||
// if (orgDna.rootDnaId) {
|
||||
// conditions.push("evaluation.rootDnaId = :root AND evaluation.child1DnaId IS NOT NULL");
|
||||
// params.root = orgDna.rootDnaId;
|
||||
// }
|
||||
// } else if (level === 2) {
|
||||
// conditions.push("evaluation.child1DnaId = :child1 AND evaluation.child2DnaId IS NOT NULL");
|
||||
// params.child1 = orgDna.child1DnaId;
|
||||
// } else if (level === 3) {
|
||||
// conditions.push("evaluation.child2DnaId = :child2 AND evaluation.child3DnaId IS NOT NULL");
|
||||
// params.child2 = orgDna.child2DnaId;
|
||||
// } else if (level === 4) {
|
||||
// conditions.push("evaluation.child3DnaId = :child3 AND evaluation.child4DnaId IS NOT NULL");
|
||||
// params.child3 = orgDna.child3DnaId;
|
||||
// }
|
||||
|
||||
if (conditions.length > 0) {
|
||||
typeCondition = {
|
||||
query: conditions.join(" AND "),
|
||||
params,
|
||||
};
|
||||
}
|
||||
}
|
||||
} else if (_data.privilege === "OWNER" || _data.privilege === "ROOT") {
|
||||
// if (conditions.length > 0) {
|
||||
// typeCondition = {
|
||||
// query: conditions.join(" AND "),
|
||||
// params,
|
||||
// };
|
||||
// }
|
||||
// }
|
||||
} else if (_data.privilege === "OWNER" || _data.privilege === "ROOT" || _data.privilege === "PARENT") {
|
||||
if (orgDna.rootDnaId) {
|
||||
conditions.push("evaluation.rootDnaId = :root");
|
||||
params.root = orgDna.rootDnaId;
|
||||
|
|
|
|||
|
|
@ -96,8 +96,10 @@ class CheckAuth {
|
|||
};
|
||||
} else if (privilege == "PARENT") {
|
||||
data = {
|
||||
root: [x.orgRootId],
|
||||
child1: [null],
|
||||
// root: [x.orgRootId],
|
||||
// child1: [null],
|
||||
root: null,
|
||||
child1: null,
|
||||
child2: null,
|
||||
child3: null,
|
||||
child4: null,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue