|
|
@@ -46,7 +46,7 @@ export class UserService {
|
|
|
try {
|
|
|
return await this.userRepository.findOne({
|
|
|
where: { username },
|
|
|
- relations: ['roles']
|
|
|
+ relations: ['roles', 'avatarFile']
|
|
|
});
|
|
|
} catch (error) {
|
|
|
console.error('Error getting user:', error);
|
|
|
@@ -58,7 +58,7 @@ export class UserService {
|
|
|
try {
|
|
|
return await this.userRepository.findOne({
|
|
|
where: { phone: phone },
|
|
|
- relations: ['roles']
|
|
|
+ relations: ['roles', 'avatarFile']
|
|
|
});
|
|
|
} catch (error) {
|
|
|
console.error('Error getting user by phone:', error);
|
|
|
@@ -100,6 +100,7 @@ export class UserService {
|
|
|
const queryBuilder = this.userRepository
|
|
|
.createQueryBuilder('user')
|
|
|
.leftJoinAndSelect('user.roles', 'roles')
|
|
|
+ .leftJoinAndSelect('user.avatarFile', 'avatarFile')
|
|
|
.skip(skip)
|
|
|
.take(pageSize);
|
|
|
|
|
|
@@ -138,7 +139,7 @@ export class UserService {
|
|
|
async getUsers(): Promise<User[]> {
|
|
|
try {
|
|
|
const users = await this.userRepository.find({
|
|
|
- relations: ['roles']
|
|
|
+ relations: ['roles', 'avatarFile']
|
|
|
});
|
|
|
return users;
|
|
|
} catch (error) {
|