rez_core 2.1.71 → 2.1.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.71",
+  "version": "2.1.73",
   "description": "",
   "author": "", 
   "private": false,

package/src/module/enterprise/controller/organization.controller.ts

@@ -26,7 +26,12 @@ export class OrganizationController {
   async getOrganizationHierarchy(@Req() req: Request & { user: any }) {
     const userId = req.user.userData?.id;
     const appcode = req.user.userData?.appcode;
+    const org_id = req.user.userData?.organization_id;
 
-    return await this.orgService.getOrganizationHierarchy(userId, appcode);
+    return await this.orgService.getOrganizationHierarchy(
+      userId,
+      appcode,
+      org_id,
+    );
   }
 }

package/src/module/enterprise/repository/school.repository.ts

@@ -24,7 +24,7 @@ export class SchoolRepository {
     });
   }
 
-  async getUserContextDropdown(userId: number, appCode: string) {
+  async getUserContextDropdown(userId: number, appCode: string, org_id) {
     const userRoleRepo = this.dataSource.getRepository(UserRoleMapping);
 
     const hasOrgAccess = await userRoleRepo
@@ -34,6 +34,15 @@ export class SchoolRepository {
       .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
       .getRawMany();
 
+    console.log('hasOrgAccess before', hasOrgAccess);
+
+    let currentORGLevel_id = hasOrgAccess[0]?.urm_level_id;
+    if (hasOrgAccess[0].urm_level_id == 1) {
+      currentORGLevel_id = org_id;
+    }
+
+    console.log('currentORGLevel_id', currentORGLevel_id);
+
     if (hasOrgAccess.length > 0) {
       const schools = await this.dataSource
         .createQueryBuilder()
@@ -53,9 +62,11 @@ export class SchoolRepository {
         .from('cr_school', 'sch')
         .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
         .innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
-        .where('org.id = :orgId', { orgId: hasOrgAccess[0].urm_level_id })
+        .where('org.id = :orgId', { orgId: currentORGLevel_id })
         .getRawMany();
 
+      console.log('schools', schools);
+
       const result = {};
       for (const row of schools) {
         const {

package/src/module/enterprise/service/organization.service.ts

@@ -78,7 +78,15 @@ export class OrganizationService {
     await repo.delete(id);
   }
 
-  async getOrganizationHierarchy(userId: number, appCode: string) {
-    return await this.schoolRepository.getUserContextDropdown(userId, appCode);
+  async getOrganizationHierarchy(
+    userId: number,
+    appCode: string,
+    orgId: number,
+  ) {
+    return await this.schoolRepository.getUserContextDropdown(
+      userId,
+      appCode,
+      orgId,
+    );
   }
 }