From 6edb5da84f73e39e43e0bacb8cebfdf77b528f28 Mon Sep 17 00:00:00 2001
From: laxman h <laxman.halaki@tech4biz.org>
Date: Thu, 26 Mar 2026 21:20:58 +0530
Subject: [PATCH] location hiarrch alteration done

---
 src/modules/admin/admin.controller.ts   | 2 +-
 src/modules/master/master.controller.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/admin/admin.controller.ts b/src/modules/admin/admin.controller.ts
index 4862eb7..bdef007 100644
--- a/src/modules/admin/admin.controller.ts
+++ b/src/modules/admin/admin.controller.ts
@@ -379,7 +379,7 @@ export const updateUser = async (req: AuthRequest, res: Response) => {
         await user.update(updates);
 
         if (Array.isArray(assignments)) {
-            await upsertUserAssignments(id, assignments, req.user?.id);
+            await upsertUserAssignments(id as string, assignments, req.user?.id);
         } else if (roleCode !== undefined || locationId !== undefined) {
             const primaryRoleCode = roleCode || user.roleCode;
             if (primaryRoleCode) {
diff --git a/src/modules/master/master.controller.ts b/src/modules/master/master.controller.ts
index 656fadf..8c3d586 100644
--- a/src/modules/master/master.controller.ts
+++ b/src/modules/master/master.controller.ts
@@ -331,7 +331,9 @@ export const getManagersByRole = async (req: Request, res: Response) => {
             const asmAssignments = assignments.filter((a: any) =>
                 (a.role?.roleCode === 'ASM' || m.roleCode === 'ASM') && a.location?.type === 'area'
             );
-            const asmCode = assignments.find((a: any) => a.managerCode)?.managerCode || null;
+            const asmCode = assignments.find((a: any) =>
+                (a.role?.roleCode === 'ASM' || m.roleCode === 'ASM') && a.managerCode
+            )?.managerCode || null;
 
             const result = m.toJSON();
             result.asmCode = asmCode;