rez_core 6.5.34 → 6.5.36

package/package.json

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

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

@@ -77,7 +77,7 @@ export class MenuRepository extends Repository<MenuData> {
         'sso_module',
         'module',
         `
-          menu.module_code = module.module_code
+          menu.module_id = module.id
           AND menu.app_id = module.app_id
           AND menu.level_type = module.level_type
         `,

package/src/module/user/service/user.service.ts

@@ -12,6 +12,7 @@ import { plainToInstance } from 'class-transformer';
 import { UpdateUserDto } from '../dto/update-user.dto';
 import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
 import { StatusConstant } from '../../../constant/status.constant';
+import { RoleService } from './role.service';
 
 @Injectable()
 @ActionHandler('User')
@@ -19,6 +20,7 @@ export class UserService {
   constructor(
     private userRepository: UserRepository,
     private userRoleMappingService: UserRoleMappingService,
+    private roleService: RoleService,
     private configService: ConfigService,
     private readonly enterpriseRepository: EnterpriseRepository,
   ) {
@@ -125,12 +127,8 @@ export class UserService {
         for (const i in userRoleMappings) {
           const userRoleMapping = userRoleMappings[i];
           const roleId = userRoleMapping.role_id;
-          // const role = await super.getEntityData(
-          //   ENTITYTYPE_ROLE,
-          //   roleId,
-          //   loggedInUser,
-          // );
-          // roles.push(role);
+          const role = await this.roleService.findById(roleId);
+          roles.push(role);
         }
         userDto.roles = roles;
       }