rez_core 6.5.38 → 6.5.40

package/package.json

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

package/src/module/module/entity/menu.entity.ts

@@ -1,6 +1,7 @@
 import { Column, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { ModuleData } from './module.entity';
 import { AppMaster } from 'src/module/meta/entity/app-master.entity';
+import { Exclude } from 'class-transformer';
 
 @Entity({ name: 'sso_menu' })
 export class MenuData {
@@ -10,6 +11,9 @@ export class MenuData {
   @Column({ type: 'varchar', length: 100, nullable: true })
   name: string;
 
+  @Exclude()
+  module_code:string;
+
   @Column({ type: 'int', nullable: true })
   module_id: number
 

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

@@ -88,6 +88,7 @@ export class MenuRepository extends Repository<MenuData> {
       .andWhere('menu.ui_visible = 1')
       .select([
         'menu.*',
+        'module.module_code AS module_code',
         'module.component_name AS component',
         'module.title AS title',
         'module.entity_type AS entity_type',

package/src/module/module/repository/module-access.repository.ts

@@ -168,8 +168,8 @@ export class ModuleAccessRepository {
 
     const appMaster = await appMasterRepo.find({
       where: {
-        code: appcode
-      }
+        code: appcode,
+      },
     });
 
     if (!appMaster) {
@@ -348,7 +348,7 @@ export class ModuleAccessRepository {
       where: {
         id: In(roleIds),
         app: {
-          code: appcode
+          code: appcode,
         },
       },
       select: ['id', 'code'],
@@ -358,22 +358,24 @@ export class ModuleAccessRepository {
     if (!roleCodes.length) return [];
 
     const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-    const appMaster =await appMasterRepo.findOne({
+    const appMaster = await appMasterRepo.findOne({
       where: {
-        code: appcode
-      }
-    })
+        code: appcode,
+      },
+    });
 
     // Step 2: Fetch full access data
     const accessRecords = await this.moduleAccessRepo
       .createQueryBuilder('access')
       .select([
-        'access.module_code AS module_code',
+        'access.module_id AS module_id',
+        'm.module_code AS module_code',
         'access.action_type AS action_type',
         'access.access_flag AS access_flag',
         'access.level_type AS level_type',
         'access.appcode AS appcode',
       ])
+      .innerJoin('sso_module', 'm', 'm.id = access.module_id')
       .where('access.role_code IN (:...roleCodes)', { roleCodes })
       .andWhere('access.app_id = :app_id', { app_id: appMaster.id })
       .getRawMany();