hrms-bangkok/hrms-api-kpi
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 53s
Details

Browse source
This commit is contained in:
harid 2026-02-19 15:16:58 +07:00
commit 0f0105a2d7
3 changed files with 72 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/KpiUserDevelopmentController.ts
View file

@ -393,7 +393,8 @@ export class KpiUserDevelopmentController extends Controller {
_data.child1 != undefined && _data.child1 != null _data.child1 != undefined && _data.child1 != null
? _data.child1[0] != null ? _data.child1[0] != null
? `kpiUserEvaluation.child1DnaId IN (:...child1)` ? `kpiUserEvaluation.child1DnaId IN (:...child1)`
: `kpiUserEvaluation.child1DnaId is ${_data.privilege == "PARENT" ? "not null" : "null"}` // : `kpiUserEvaluation.child1DnaId is ${_data.privilege == "PARENT" ? "not null" : "null"}`
: `kpiUserEvaluation.child1DnaId is null`
: "1=1", : "1=1",
{ {
child1: _data.child1, child1: _data.child1,

128
src/controllers/KpiUserEvaluationController.ts
View file

@ -261,7 +261,7 @@ export class KpiUserEvaluationController extends Controller {
let conditions: string[] = []; let conditions: string[] = [];
let params: any = {}; 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 (_data.privilege === "CHILD") {
if (level === 0 && orgDna.rootDnaId) { if (level === 0 && orgDna.rootDnaId) {
@ -295,7 +295,8 @@ export class KpiUserEvaluationController extends Controller {
params, params,
}; };
} }
} else if (_data.privilege === "BROTHER") { }
else if (_data.privilege === "BROTHER") {
const parentLevel = level !== null ? level - 1 : null; const parentLevel = level !== null ? level - 1 : null;
if (parentLevel != null && parentLevel === 0 && orgDna.rootDnaId) { if (parentLevel != null && parentLevel === 0 && orgDna.rootDnaId) {
conditions.push("kpiUserEvaluation.orgDnaId = :root"); conditions.push("kpiUserEvaluation.orgDnaId = :root");
@ -323,36 +324,37 @@ export class KpiUserEvaluationController extends Controller {
params, params,
}; };
} }
} else if (_data.privilege === "PARENT") { }
if (level === 0) { // else if (_data.privilege === "PARENT") {
if (orgDna.rootDnaId) { // if (level === 0) {
conditions.push("kpiUserEvaluation.orgDnaId = :root"); // if (orgDna.rootDnaId) {
params.root = orgDna.rootDnaId; // conditions.push("kpiUserEvaluation.orgDnaId = :root");
} // params.root = orgDna.rootDnaId;
} else if (level === 1) { // }
if (orgDna.rootDnaId) { // } else if (level === 1) {
conditions.push("kpiUserEvaluation.orgDnaId = :root AND kpiUserEvaluation.child1DnaId IS NOT NULL"); // if (orgDna.rootDnaId) {
params.root = orgDna.rootDnaId; // conditions.push("kpiUserEvaluation.orgDnaId = :root AND kpiUserEvaluation.child1DnaId IS NOT NULL");
} // params.root = orgDna.rootDnaId;
} else if (level === 2) { // }
conditions.push("kpiUserEvaluation.child1DnaId = :child1 AND kpiUserEvaluation.child2DnaId IS NOT NULL"); // } else if (level === 2) {
params.child1 = orgDna.child1DnaId; // conditions.push("kpiUserEvaluation.child1DnaId = :child1 AND kpiUserEvaluation.child2DnaId IS NOT NULL");
} else if (level === 3) { // params.child1 = orgDna.child1DnaId;
conditions.push("kpiUserEvaluation.child2DnaId = :child2 AND kpiUserEvaluation.child3DnaId IS NOT NULL"); // } else if (level === 3) {
params.child2 = orgDna.child2DnaId; // conditions.push("kpiUserEvaluation.child2DnaId = :child2 AND kpiUserEvaluation.child3DnaId IS NOT NULL");
} else if (level === 4) { // params.child2 = orgDna.child2DnaId;
conditions.push("kpiUserEvaluation.child3DnaId = :child3 AND kpiUserEvaluation.child4DnaId IS NOT NULL"); // } else if (level === 4) {
params.child3 = orgDna.child3DnaId; // conditions.push("kpiUserEvaluation.child3DnaId = :child3 AND kpiUserEvaluation.child4DnaId IS NOT NULL");
} // params.child3 = orgDna.child3DnaId;
// }
if (conditions.length > 0) { // if (conditions.length > 0) {
typeCondition = { // typeCondition = {
query: conditions.join(" AND "), // query: conditions.join(" AND "),
params, // params,
}; // };
} // }
} // }
} else if (_data.privilege === "OWNER" || _data.privilege === "ROOT") { } else if (_data.privilege === "OWNER" || _data.privilege === "ROOT" || _data.privilege === "PARENT") {
if (orgDna.rootDnaId) { if (orgDna.rootDnaId) {
conditions.push("kpiUserEvaluation.orgDnaId = :root"); conditions.push("kpiUserEvaluation.orgDnaId = :root");
params.root = orgDna.rootDnaId; params.root = orgDna.rootDnaId;
@ -600,7 +602,7 @@ export class KpiUserEvaluationController extends Controller {
let conditions: string[] = []; let conditions: string[] = [];
let params: any = {}; 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 (_data.privilege === "CHILD") {
if (level === 0 && orgDna.rootDnaId) { if (level === 0 && orgDna.rootDnaId) {
@ -634,7 +636,8 @@ export class KpiUserEvaluationController extends Controller {
params, params,
}; };
} }
} else if (_data.privilege === "BROTHER") { }
else if (_data.privilege === "BROTHER") {
const parentLevel = level !== null ? level - 1 : null; const parentLevel = level !== null ? level - 1 : null;
if (parentLevel != null && parentLevel === 0 && orgDna.rootDnaId) { if (parentLevel != null && parentLevel === 0 && orgDna.rootDnaId) {
conditions.push("kpiUserEvaluation.orgDnaId = :root"); conditions.push("kpiUserEvaluation.orgDnaId = :root");
@ -662,36 +665,37 @@ export class KpiUserEvaluationController extends Controller {
params, params,
}; };
} }
} else if (_data.privilege === "PARENT") { }
if (level === 0) { // else if (_data.privilege === "PARENT") {
if (orgDna.rootDnaId) { // if (level === 0) {
conditions.push("kpiUserEvaluation.orgDnaId = :root"); // if (orgDna.rootDnaId) {
params.root = orgDna.rootDnaId; // conditions.push("kpiUserEvaluation.orgDnaId = :root");
} // params.root = orgDna.rootDnaId;
} else if (level === 1) { // }
if (orgDna.rootDnaId) { // } else if (level === 1) {
conditions.push("kpiUserEvaluation.orgDnaId = :root AND kpiUserEvaluation.child1DnaId IS NOT NULL"); // if (orgDna.rootDnaId) {
params.root = orgDna.rootDnaId; // conditions.push("kpiUserEvaluation.orgDnaId = :root AND kpiUserEvaluation.child1DnaId IS NOT NULL");
} // params.root = orgDna.rootDnaId;
} else if (level === 2) { // }
conditions.push("kpiUserEvaluation.child1DnaId = :child1 AND kpiUserEvaluation.child2DnaId IS NOT NULL"); // } else if (level === 2) {
params.child1 = orgDna.child1DnaId; // conditions.push("kpiUserEvaluation.child1DnaId = :child1 AND kpiUserEvaluation.child2DnaId IS NOT NULL");
} else if (level === 3) { // params.child1 = orgDna.child1DnaId;
conditions.push("kpiUserEvaluation.child2DnaId = :child2 AND kpiUserEvaluation.child3DnaId IS NOT NULL"); // } else if (level === 3) {
params.child2 = orgDna.child2DnaId; // conditions.push("kpiUserEvaluation.child2DnaId = :child2 AND kpiUserEvaluation.child3DnaId IS NOT NULL");
} else if (level === 4) { // params.child2 = orgDna.child2DnaId;
conditions.push("kpiUserEvaluation.child3DnaId = :child3 AND kpiUserEvaluation.child4DnaId IS NOT NULL"); // } else if (level === 4) {
params.child3 = orgDna.child3DnaId; // conditions.push("kpiUserEvaluation.child3DnaId = :child3 AND kpiUserEvaluation.child4DnaId IS NOT NULL");
} // params.child3 = orgDna.child3DnaId;
// }
if (conditions.length > 0) { // if (conditions.length > 0) {
typeCondition = { // typeCondition = {
query: conditions.join(" AND "), // query: conditions.join(" AND "),
params, // params,
}; // };
} // }
} // }
} else if (_data.privilege === "OWNER" || _data.privilege === "ROOT") { } else if (_data.privilege === "OWNER" || _data.privilege === "ROOT" || _data.privilege === "PARENT") {
if (orgDna.rootDnaId) { if (orgDna.rootDnaId) {
conditions.push("kpiUserEvaluation.orgDnaId = :root"); conditions.push("kpiUserEvaluation.orgDnaId = :root");
params.root = orgDna.rootDnaId; params.root = orgDna.rootDnaId;

6
src/interfaces/permission.ts
View file

@ -96,8 +96,10 @@ class CheckAuth {
}; };
} else if (privilege == "PARENT") { } else if (privilege == "PARENT") {
data = { data = {
root: [x.orgRootId], // root: [x.orgRootId],
child1: [null], // child1: [null],
root: null,
child1: null,
child2: null, child2: null,
child3: null, child3: null,
child4: null, child4: null,