This commit is contained in:
@@ -119,10 +119,21 @@ export class UserRepository extends Repository<User> {
|
|||||||
.loadRelationCountAndMap("user.ticketsCount", "user.tickets");
|
.loadRelationCountAndMap("user.ticketsCount", "user.tickets");
|
||||||
|
|
||||||
if (queryDto.q) {
|
if (queryDto.q) {
|
||||||
queryBuilder
|
queryBuilder.andWhere(
|
||||||
.orWhere("user.firstName ILIKE :search", { search: `%${queryDto.q}%` })
|
`(
|
||||||
.orWhere("user.lastName ILIKE :search", { search: `%${queryDto.q}%` })
|
user.firstName ILIKE :search
|
||||||
.orWhere("user.userName ILIKE :search", { search: `%${queryDto.q}%` });
|
OR user.lastName ILIKE :search
|
||||||
|
OR CONCAT(user.firstName, ' ', user.lastName) ILIKE :search
|
||||||
|
OR user.userName ILIKE :search
|
||||||
|
OR user.phone ILIKE :search
|
||||||
|
OR legalUser.registrationName ILIKE :search
|
||||||
|
OR legalUser.phone ILIKE :search
|
||||||
|
OR realUser.firstName ILIKE :search
|
||||||
|
OR realUser.lastName ILIKE :search
|
||||||
|
OR realUser.phone ILIKE :search
|
||||||
|
)`,
|
||||||
|
{ search: `%${queryDto.q}%` },
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return queryBuilder.getMany();
|
return queryBuilder.getMany();
|
||||||
@@ -166,10 +177,21 @@ export class UserRepository extends Repository<User> {
|
|||||||
.loadRelationCountAndMap("user.ticketsCount", "user.tickets");
|
.loadRelationCountAndMap("user.ticketsCount", "user.tickets");
|
||||||
|
|
||||||
if (queryDto.q) {
|
if (queryDto.q) {
|
||||||
queryBuilder
|
queryBuilder.andWhere(
|
||||||
.orWhere("user.firstName ILIKE :search", { search: `%${queryDto.q}%` })
|
`(
|
||||||
.orWhere("user.lastName ILIKE :search", { search: `%${queryDto.q}%` })
|
user.firstName ILIKE :search
|
||||||
.orWhere("user.userName ILIKE :search", { search: `%${queryDto.q}%` });
|
OR user.lastName ILIKE :search
|
||||||
|
OR CONCAT(user.firstName, ' ', user.lastName) ILIKE :search
|
||||||
|
OR user.userName ILIKE :search
|
||||||
|
OR user.phone ILIKE :search
|
||||||
|
OR legalUser.registrationName ILIKE :search
|
||||||
|
OR legalUser.phone ILIKE :search
|
||||||
|
OR realUser.firstName ILIKE :search
|
||||||
|
OR realUser.lastName ILIKE :search
|
||||||
|
OR realUser.phone ILIKE :search
|
||||||
|
)`,
|
||||||
|
{ search: `%${queryDto.q}%` },
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return await queryBuilder
|
return await queryBuilder
|
||||||
|
|||||||
Reference in New Issue
Block a user