From db36b250e3d798519ca939314d90b0097de5151b Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Tue, 16 Jun 2026 15:50:15 +0700
Subject: [PATCH] =?UTF-8?q?face=20=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=E0=B8=AB=E0=B8=B1=E0=B8=A7=E0=B8=AB=E0=B8=99=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=97=E0=B8=B1=E0=B9=89=E0=B8=87=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=20#1597?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/WorkflowController.ts | 73 +++++++++++++++------------
 1 file changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts
index ae5c8859..d8aa0b77 100644
--- a/src/controllers/WorkflowController.ts
+++ b/src/controllers/WorkflowController.ts
@@ -865,6 +865,7 @@ export class WorkflowController extends Controller {
       type?: string | null;
       sortBy?: string | null;
       descending?: boolean;
+      isAllDirector?: boolean;
     },
   ) {
     const userKeycloak = body.keycloakId ?? request.user.sub;
@@ -953,38 +954,46 @@ export class WorkflowController extends Controller {
     let mainConditions: any[] = [];
 
     if (type.trim().toUpperCase() === "OPERATE" || body.type === "employee") {
-      mainConditions = [
-        { ...baseCondition, orgRootId: In(roodIds), orgChild1Id: IsNull() },
-        {
-          ...baseCondition,
-          orgRootId: In(roodIds),
-          orgChild1Id: posMasterUser.orgChild1Id,
-          orgChild2Id: IsNull(),
-        },
-        {
-          ...baseCondition,
-          orgRootId: In(roodIds),
-          orgChild1Id: posMasterUser.orgChild1Id,
-          orgChild2Id: posMasterUser.orgChild2Id,
-          orgChild3Id: IsNull(),
-        },
-        {
-          ...baseCondition,
-          orgRootId: In(roodIds),
-          orgChild1Id: posMasterUser.orgChild1Id,
-          orgChild2Id: posMasterUser.orgChild2Id,
-          orgChild3Id: posMasterUser.orgChild3Id,
-          orgChild4Id: IsNull(),
-        },
-        {
-          ...baseCondition,
-          orgRootId: In(roodIds),
-          orgChild1Id: posMasterUser.orgChild1Id,
-          orgChild2Id: posMasterUser.orgChild2Id,
-          orgChild3Id: posMasterUser.orgChild3Id,
-          orgChild4Id: posMasterUser.orgChild4Id,
-        },
-      ];
+
+      if (body.isAllDirector === true) {
+        mainConditions = [
+          { ...baseCondition, orgRootId: In(roodIds) }
+        ];
+      }
+      else {
+        mainConditions = [
+          { ...baseCondition, orgRootId: In(roodIds), orgChild1Id: IsNull() },
+          {
+            ...baseCondition,
+            orgRootId: In(roodIds),
+            orgChild1Id: posMasterUser.orgChild1Id,
+            orgChild2Id: IsNull(),
+          },
+          {
+            ...baseCondition,
+            orgRootId: In(roodIds),
+            orgChild1Id: posMasterUser.orgChild1Id,
+            orgChild2Id: posMasterUser.orgChild2Id,
+            orgChild3Id: IsNull(),
+          },
+          {
+            ...baseCondition,
+            orgRootId: In(roodIds),
+            orgChild1Id: posMasterUser.orgChild1Id,
+            orgChild2Id: posMasterUser.orgChild2Id,
+            orgChild3Id: posMasterUser.orgChild3Id,
+            orgChild4Id: IsNull(),
+          },
+          {
+            ...baseCondition,
+            orgRootId: In(roodIds),
+            orgChild1Id: posMasterUser.orgChild1Id,
+            orgChild2Id: posMasterUser.orgChild2Id,
+            orgChild3Id: posMasterUser.orgChild3Id,
+            orgChild4Id: posMasterUser.orgChild4Id,
+          },
+        ];
+      }
     } else if (isLowLevel) {
       mainConditions = [
         {