diff --git a/src/modules/admin/providers/admin.service.ts b/src/modules/admin/providers/admin.service.ts index f09c435..74474bd 100644 --- a/src/modules/admin/providers/admin.service.ts +++ b/src/modules/admin/providers/admin.service.ts @@ -86,7 +86,7 @@ export class AdminService { } if (rest.phone !== undefined && rest.phone !== admin.phone) { - const exists = await this.adminRepository.findOne({ phone: rest.phone }); + const exists = await this.adminRepository.findOne({ phone: rest.phone,id: { $ne: adminId } }); if (exists) { throw new ConflictException('This Phone Number is already taken'); } diff --git a/src/modules/roles/entities/permission.entity.ts b/src/modules/roles/entities/permission.entity.ts index 07ea396..b66bcb8 100755 --- a/src/modules/roles/entities/permission.entity.ts +++ b/src/modules/roles/entities/permission.entity.ts @@ -1,7 +1,6 @@ import { Entity, Property, Unique, ManyToMany, Collection, PrimaryKey, Enum, OptionalProps } from '@mikro-orm/core'; import { BaseEntity } from '../../../common/entities/base.entity'; import { Role } from './role.entity'; -import { ulid } from 'ulid'; import { PermissionEnum } from 'src/common/enums/permission.enum'; @Entity({ tableName: 'permissions' })