hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into develop-Bright

Browse source
This commit is contained in:
Bright 2024-10-08 16:35:34 +07:00
commit 3ec5cc7670
2 changed files with 177 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/controllers/CommandController.ts
View file

@ -130,18 +130,6 @@ export class CommandController extends Controller {
) {
const [commands, total] = await this.commandRepository
.createQueryBuilder("command")
.andWhere(
new Brackets((qb) => {
qb.where(keyword != null && keyword != "" ? "command.commandNo LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
}).orWhere(
keyword != null && keyword != "" ? "command.createdFullName LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
);
}),
)
.andWhere(
status != null && status != undefined && status != ""
? "command.status IN (:...status)"
@ -175,6 +163,18 @@ export class CommandController extends Controller {
: `${commandTypeId}`,
},
)
.andWhere(
new Brackets((qb) => {
qb.where(keyword != null && keyword != "" ? "command.commandNo LIKE :keyword" : "1=1", {
keyword: `%${keyword}%`,
}).orWhere(
keyword != null && keyword != "" ? "command.issue LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
);
}),
)
.orderBy("command.createdAt", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)