From 9f2fec3ee37e9a131044b2e9ea8abaf7db63e171 Mon Sep 17 00:00:00 2001 From: harid Date: Fri, 15 May 2026 11:12:17 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87=20Noti=20=E0=B8=AA?= =?UTF-8?q?=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C=20BROTHER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/OrganizationDotnetController.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index e61bc4d8..c5efd798 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -8863,7 +8863,6 @@ export class OrganizationDotnetController extends Controller { // Staff ต้องอยู่บนกว่าหรือเท่ากับ User if (staffNode > userNode) return false; - // เช็ค DNA ตรงกันที่ระดับ Staff switch (staffNode) { case 0: if (staffDna.root !== userDna.root) return false; @@ -8896,10 +8895,8 @@ export class OrganizationDotnetController extends Controller { // BROTHER: Staff เห็น User ที่อยู่ในกิ่งข้างบนและลูก if (privilege === "BROTHER") { - // User ต้องอยู่ในช่วง [Staff Node - 1, 4] if (userNode < staffNode - 1 || userNode > 4) return false; - // เช็ค DNA ตรงกันตามระดับของ Staff if (staffNode === 0) { if (staffDna.root !== userDna.root) return false; } else if (staffNode === 1) { @@ -8907,14 +8904,13 @@ export class OrganizationDotnetController extends Controller { if (staffDna.child1 !== userDna.child1) return false; } else if (staffNode === 2) { if (staffDna.child1 !== userDna.child1) return false; - if (staffDna.child2 !== userDna.child2) return false; - if (staffDna.child3 !== userDna.child3) return false; + if (staffDna.child2 !== userDna.child2 && userDna.child2 !== null) return false; } else if (staffNode === 3) { if (staffDna.child2 !== userDna.child2) return false; - if (staffDna.child3 !== userDna.child3) return false; + if (staffDna.child3 !== userDna.child3 && userDna.child3 !== null) return false; } else if (staffNode === 4) { if (staffDna.child3 !== userDna.child3) return false; - if (staffDna.child4 !== userDna.child4) return false; + if (staffDna.child4 !== userDna.child4 && userDna.child4 !== null) return false; } return true; }