rez_core 2.0.65 → 2.0.66

package/package.json

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

package/src/module/module/repository/menu.repository.ts

@@ -78,7 +78,7 @@ export class MenuRepository extends Repository<MenuData> {
     levelId: number,
   ): Promise<number[]> {
     const repo = this.dataSource.getRepository(UserRoleMapping);
-
+  
     // 1. Try exact level match
     let roles = await repo.createQueryBuilder('urm')
       .innerJoin('cr_role', 'role', 'role.id = urm.role_id')
@@ -88,34 +88,33 @@ export class MenuRepository extends Repository<MenuData> {
       .andWhere('urm.level_id = :levelId', { levelId })
       .andWhere('role.appcode = :appcode', { appcode })
       .getRawMany();
-
+  
     if (roles.length) return roles.map(r => r.urm_role_id);
-
+  
     // 2. If SCH fallback → BRN → ORG
     if (levelType === 'SCH') {
       const [sch] = await this.dataSource.query(`
-        SELECT s.brn_id, b.org_id
+        SELECT s.brand_id, s.organization_id
         FROM cr_school s
-        LEFT JOIN cr_brand b ON s.brn_id = b.id
         WHERE s.id = $1
       `, [levelId]);
-
-      const branchId = sch?.brn_id;
-      const orgId = sch?.org_id;
-
-      if (branchId) {
+  
+      const brandId = sch?.brand_id;
+      const orgId = sch?.organization_id;
+  
+      if (brandId) {
         roles = await repo.createQueryBuilder('urm')
           .innerJoin('cr_role', 'role', 'role.id = urm.role_id')
           .select('urm.role_id')
           .where('urm.user_id = :userId', { userId })
           .andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
-          .andWhere('urm.level_id = :levelId', { levelId: branchId })
+          .andWhere('urm.level_id = :levelId', { levelId: brandId })
           .andWhere('role.appcode = :appcode', { appcode })
           .getRawMany();
-
+  
         if (roles.length) return roles.map(r => r.urm_role_id);
       }
-
+  
       if (orgId) {
         roles = await repo.createQueryBuilder('urm')
           .innerJoin('cr_role', 'role', 'role.id = urm.role_id')
@@ -125,11 +124,12 @@ export class MenuRepository extends Repository<MenuData> {
           .andWhere('urm.level_id = :levelId', { levelId: orgId })
           .andWhere('role.appcode = :appcode', { appcode })
           .getRawMany();
-
+  
         if (roles.length) return roles.map(r => r.urm_role_id);
       }
     }
-
+  
     return [];
   }
+  
 }