fix search with concat fullname

This commit is contained in:
AdisakKanthawilang 2024-02-15 13:08:41 +07:00
parent dc85167d7f
commit 4f4a3d1353

View file

@ -855,12 +855,11 @@ export class PositionController extends Controller {
.leftJoinAndSelect('posMaster.current_holder', 'current_holder') .leftJoinAndSelect('posMaster.current_holder', 'current_holder')
.leftJoinAndSelect('posMaster.next_holder', 'next_holder') .leftJoinAndSelect('posMaster.next_holder', 'next_holder')
.where(conditions) .where(conditions)
// .orWhere('(current_holder.prefix LIKE :keyword OR current_holder.firstName LIKE :keyword OR current_holder.lastName LIKE :keyword)', { keyword: `%${body.keyword}%` })
.orWhere( .orWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.where( qb.where(
body.keyword != null && body.keyword != "" body.keyword != null && body.keyword != ""
? "current_holder.prefix LIKE :keyword OR current_holder.firstName LIKE :keyword OR current_holder.lastName LIKE :keyword OR :keyword LIKE current_holder.prefix OR :keyword LIKE current_holder.firstName OR :keyword LIKE current_holder.lastName" ? "CONCAT(current_holder.prefix, current_holder.firstName, current_holder.lastName) LIKE :keyword OR :keyword LIKE current_holder.prefix OR :keyword LIKE current_holder.firstName OR :keyword LIKE current_holder.lastName "
: "1=1", : "1=1",
{ {
keyword: `%${body.keyword}%`, keyword: `%${body.keyword}%`,