rez_core 6.5.35 → 6.5.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/user/service/user.service.d.ts +3 -1
- package/dist/module/user/service/user.service.js +6 -1
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/table.config.d.ts +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/user/service/user.service.ts +4 -6
package/package.json
CHANGED
|
@@ -12,6 +12,7 @@ import { plainToInstance } from 'class-transformer';
|
|
|
12
12
|
import { UpdateUserDto } from '../dto/update-user.dto';
|
|
13
13
|
import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
|
|
14
14
|
import { StatusConstant } from '../../../constant/status.constant';
|
|
15
|
+
import { RoleService } from './role.service';
|
|
15
16
|
|
|
16
17
|
@Injectable()
|
|
17
18
|
@ActionHandler('User')
|
|
@@ -19,6 +20,7 @@ export class UserService {
|
|
|
19
20
|
constructor(
|
|
20
21
|
private userRepository: UserRepository,
|
|
21
22
|
private userRoleMappingService: UserRoleMappingService,
|
|
23
|
+
private roleService: RoleService,
|
|
22
24
|
private configService: ConfigService,
|
|
23
25
|
private readonly enterpriseRepository: EnterpriseRepository,
|
|
24
26
|
) {
|
|
@@ -125,12 +127,8 @@ export class UserService {
|
|
|
125
127
|
for (const i in userRoleMappings) {
|
|
126
128
|
const userRoleMapping = userRoleMappings[i];
|
|
127
129
|
const roleId = userRoleMapping.role_id;
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
// roleId,
|
|
131
|
-
// loggedInUser,
|
|
132
|
-
// );
|
|
133
|
-
// roles.push(role);
|
|
130
|
+
const role = await this.roleService.findById(roleId);
|
|
131
|
+
roles.push(role);
|
|
134
132
|
}
|
|
135
133
|
userDto.roles = roles;
|
|
136
134
|
}
|