删除adminUserService,合并到userService中
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post, Put, Query } from "@nestjs/common";
|
||||
import { AdminUserService } from "../service/admin-user.service";
|
||||
import { ListDto } from "../dto/admin-user/list.dto";
|
||||
import { CreateDto } from "../dto/admin-user/create.dto";
|
||||
import { UserService } from "src/user/user.service";
|
||||
@@ -10,7 +9,6 @@ import { UpdatePasswordDto } from "../dto/admin-user/update-password.dto";
|
||||
export class AdminUserController {
|
||||
|
||||
constructor(
|
||||
private readonly adminUserService: AdminUserService,
|
||||
private readonly userService: UserService,
|
||||
) { }
|
||||
|
||||
@@ -18,7 +16,7 @@ export class AdminUserController {
|
||||
async list(
|
||||
@Query() listDto: ListDto
|
||||
) {
|
||||
return this.adminUserService.getUser(listDto.page, listDto.pageSize);
|
||||
return this.userService.list(listDto.page, listDto.pageSize);
|
||||
}
|
||||
|
||||
@Get(':userId')
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
import { Injectable } from "@nestjs/common";
|
||||
import { InjectRepository } from "@nestjs/typeorm";
|
||||
import { User } from "src/user/entities/user.entity";
|
||||
import { Repository } from "typeorm";
|
||||
|
||||
@Injectable()
|
||||
export class AdminUserService {
|
||||
|
||||
constructor(
|
||||
@InjectRepository(User)
|
||||
private readonly userRepository: Repository<User>,
|
||||
) { }
|
||||
|
||||
async getUser(page = 1, pageSize = 20) {
|
||||
const queryBuilder = this.userRepository.createQueryBuilder('user')
|
||||
|
||||
queryBuilder.orderBy('user.createdAt', 'DESC');
|
||||
|
||||
queryBuilder.skip((page - 1) * pageSize);
|
||||
queryBuilder.take(pageSize);
|
||||
|
||||
const [items, total] = await queryBuilder.getManyAndCount();
|
||||
return {
|
||||
items,
|
||||
total,
|
||||
page,
|
||||
pageSize,
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user