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

fix search commandNo #242
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
Details

Browse source
This commit is contained in:
harid 2026-05-26 16:42:17 +07:00
parent bc418666ac
commit 0aa788fe0b
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/CommandController.ts
View file

@ -343,9 +343,11 @@ export class CommandController extends Controller {
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.where( qb.where(
keyword != null && keyword != "" ? "command.commandNo LIKE :baseKeyword" : "1=1", keyword != null && keyword != ""
? "TRIM(CONCAT(COALESCE(command.shortName, ''), ' ', command.commandNo, '/', command.commandYear + 543)) LIKE :keyword"
: "1=1",
{ {
baseKeyword: `%${baseKeyword}%`, keyword: `%${keyword}%`,
}, },
) )
.orWhere(keyword != null && keyword != "" ? "command.issue LIKE :keyword" : "1=1", { .orWhere(keyword != null && keyword != "" ? "command.issue LIKE :keyword" : "1=1", {
@ -356,14 +358,6 @@ export class CommandController extends Controller {
{ {
keyword: `%${keyword}%`, keyword: `%${keyword}%`,
}, },
)
.orWhere(
keyword != null && keyword != ""
? "CONCAT(command.shortName, ' ', command.commandNo) LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
); );
}), }),
) )