.

src/common/dto/page-request.ts

@@ -1,10 +1,10 @@
 import { IsObject } from 'class-validator'
 import { IPaginationOptions } from 'nestjs-typeorm-paginate'
-import { FindManyOptions, FindOptionsWhere } from 'typeorm'
+import { FindManyOptions, FindOneOptions, FindOptionsWhere } from 'typeorm'
 
 export class PageRequest<T> {
     @IsObject()
     page: IPaginationOptions = { page: 1, limit: 20 }
 
-    search?: FindOptionsWhere<T> | FindManyOptions<T>
+    search?: FindOptionsWhere<T> | FindManyOptions<T> | FindOneOptions<T>
 }

src/phone-list/phone-list.controller.ts

@@ -21,14 +21,14 @@ import { BalanceService } from '../balance/balance.service'
 
 @Controller('phone-list')
 export class PhoneListController {
-    constructor(private readonly phoneListService: PhoneListService, private readonly balanceService: BalanceService) {
-    }
+    constructor(private readonly phoneListService: PhoneListService, private readonly balanceService: BalanceService) {}
 
     @Post('/')
     async findAllPhoneList(@Req() req, @Body() page: PageRequest<PhoneList>) {
         if (!req.user.roles.includes('admin')) {
             ;(page.search as any).where.userId = req.user.id
         }
+        ;(page.search as any).where = (page.search as any).where || {}
         ;(page.search as any).where.type = 0
         return await this.phoneListService.findAllPhoneList(page)
     }

src/users/users.admin.controller.ts

@@ -23,26 +23,25 @@ import { PageRequest } from 'src/common/dto/page-request'
 import { Users } from './entities/users.entity'
 import { UserCreateDto } from './dto/user-create.dto'
 import { In, Like } from 'typeorm'
-
 @ApiTags('users.admin')
 @Controller('/admin/users')
 @ApiBearerAuth()
 export class UsersAdminController {
-    constructor(private readonly usersService: UsersService) {
-    }
+    constructor(private readonly usersService: UsersService) {}
 
     @Post()
     public async list(@Req() req, @Body() page: PageRequest<Users>) {
         if (req.user.roles.includes('api')) {
-            ;(page.search as any).where.invitor = (req.user.id)
+            ;(page.search as any).where.invitor = req.user.id
         } else if (req.user.roles.includes('superApi')) {
             if (!(page.search as any).where.invitor) {
                 const userIds = await this.usersService.getApiInvitesIds(req.user.id)
                 ;(page.search as any).where.invitor = In(userIds)
             }
         }
+        ;(page.search as any).where = (page.search as any).where || {}
         if ((page.search as any).where.username) {
-            (page.search as any).where.username = Like(`%${(page.search as any).where.username}%`)
+            ;(page.search as any).where.username = Like(`%${(page.search as any).where.username}%`)
         }
         return await this.usersService.findAll(page)
     }