diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts index fec8fbd..2b80891 100644 --- a/src/users/users.controller.ts +++ b/src/users/users.controller.ts @@ -116,11 +116,13 @@ export class UsersController { async findAll( @Request() req, @Query('page') page: number, + @Query('pageSize') pageSize: number, @Query('superior') superior: string, @Query('type') type: string, ) { const data = await this.usersService.findAll( page, + pageSize, req.user.userId, superior == 'null' ? null : superior, type == 'null' ? null : type, @@ -180,8 +182,12 @@ export class UsersController { } @Get('find-by-supperior') - async findBySuperrior(@Request() req, @Query('page') page: number) { - const data = await this.usersService.findBySuperrior(req.user.userId, page); + async findBySuperrior( + @Request() req, + @Query('page') page: number, + @Query('pageSize') pageSize: number, + ) { + const data = await this.usersService.findBySuperrior(req.user.userId, page, pageSize); return { ...data, diff --git a/src/users/users.service.ts b/src/users/users.service.ts index 87938f9..aa2636d 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -130,7 +130,7 @@ export class UsersService { return userData; } - async findAll(page: number, id: string, superior: string, type: string) { + async findAll(page: number, pageSize: number, id: string, superior: string, type: string) { const baseQuery = this.usersRepository .createQueryBuilder('user') .where('user.id != :id', { @@ -176,8 +176,8 @@ export class UsersService { const data = await baseQuery .orderBy('user.createdAt', 'DESC') - .skip(page * 10) - .take(10) + .skip(page * pageSize) + .take(pageSize) .getMany(); const totalData = await baseQuery.getCount(); @@ -246,7 +246,7 @@ export class UsersService { }); } - async findBySuperrior(superriorId: string, page: number) { + async findBySuperrior(superriorId: string, page: number, pageSize: number) { const baseQuery = this.usersRepository .createQueryBuilder('user') .where('user.id != :id and user.superior_id = :superior', { @@ -277,8 +277,8 @@ export class UsersService { ]); const data = await baseQuery - .skip(page * 10) - .take(10) + .skip(page * pageSize) + .take(pageSize) .getMany(); const totalData = await baseQuery.getCount();