rez_core 2.1.133 → 2.1.136

package/package.json

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

package/src/module/listmaster/entity/list-master-items.entity.ts

@@ -12,19 +12,19 @@ export class ListMasterItems extends BaseEntity {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @Column()
+  @Column({ nullable: true })
   listtype: string;
 
-  @Column()
+  @Column({ nullable: true })
   name: string;
 
-  @Column()
+  @Column({ nullable: true })
   parent_code: string;
 
-  @Column()
+  @Column({ nullable: true })
   value: string;
 
-  @Column()
+  @Column({ nullable: true })
   status: string;
 
   @Column({ default: 0 })

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

@@ -23,16 +23,21 @@ export class ModuleAccessController {
     private readonly menuService: MenuService,
   ) {}
 
+
   @Get('roles')
-  async getRoles(@Query('appcode') appcode: string, @Request() req) {
-    let level_type = req.user.userData.level_type;
-    let level_id = req.user.userData.level_id;
-    let organization_id = req.user.userData.organization_id;
+  async getRoles(
+    @Query('appcode') appcode: string,
+    @Query('include') include: string, // ✅ declare it as boolean
+    @Request() req
+  ) {
+    const { level_type, level_id, organization_id } = req.user.userData;
+
     return this.moduleAccessService.getRoles({
       appcode,
       level_type,
       level_id,
       organization_id,
+      include: include === "true", // ensure it's either true or false
     });
   }
 

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

@@ -33,42 +33,49 @@ export class ModuleAccessService {
     level_type,
     level_id,
     organization_id,
+    include 
   }: {
     appcode: string;
     level_type?: string;
     level_id?: number;
     organization_id?: number;
+    include?: boolean;
   }) {
     const query = this.dataSource
       .createQueryBuilder()
       .select('*')
       .from('cr_role', 'role')
-      .where('role.appcode = :appcode', { appcode })
-      .andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
-
+      .where('role.appcode = :appcode', { appcode });
+  
+    // Only add this condition if `include` is false (exclude factory roles)
+    if (!include) {
+      query.andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
+    }
+  
     if (level_type) {
       query.andWhere('role.level_type = :level_type', { level_type });
     }
-
+  
     if (organization_id) {
       query.andWhere('role.organization_id = :organization_id', {
         organization_id,
       });
     }
-
+  
     if (level_id !== undefined) {
       query.andWhere('role.level_id = :level_id', {
         level_id: String(level_id),
       });
     }
-
-    const roles = await query.getRawMany(); // use getRawMany since you're selecting from a raw table
-
+  
+    const roles = await query.getRawMany();
+  
     return roles.map((role) => ({
       label: role.name,
       value: role.id,
     }));
   }
+  
 
   async getAccessListing(
     roleIds: number[],