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:13:53 +07:00
parent 2e217a9548
commit bc418666ac
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/controllers/CommandController.ts
View file

@ -356,6 +356,14 @@ export class CommandController extends Controller {
{ {
keyword: `%${keyword}%`, keyword: `%${keyword}%`,
}, },
)
.orWhere(
keyword != null && keyword != ""
? "CONCAT(command.shortName, ' ', command.commandNo) LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
); );
}), }),
) )
@ -2011,7 +2019,7 @@ export class CommandController extends Controller {
if (!["C-PM-21", "C-PM-23"].includes(commandCode)) { if (!["C-PM-21", "C-PM-23"].includes(commandCode)) {
_command = { _command = {
issue: issue, issue: issue,
commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()), commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
commandYear: commandYear:
command.commandYear == null command.commandYear == null
? "" ? ""
@ -2264,7 +2272,7 @@ export class CommandController extends Controller {
); );
_command = { _command = {
issue: issue, issue: issue,
commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()), commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
commandYear: commandYear:
command.commandYear == null command.commandYear == null
? "" ? ""
@ -2403,7 +2411,7 @@ export class CommandController extends Controller {
data: { data: {
data: _command, data: _command,
issuerOrganizationName: issue, issuerOrganizationName: issue,
commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()), commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
commandYear: commandYear:
command.commandYear == null command.commandYear == null
? "" ? ""
@ -8723,7 +8731,7 @@ export class CommandController extends Controller {
if (issue == null) issue = "..................................."; if (issue == null) issue = "...................................";
const _command = { const _command = {
issue: issue, issue: issue,
commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()), commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
commandYear: commandYear:
command.commandYear == null command.commandYear == null
? "" ? ""
@ -8828,7 +8836,7 @@ export class CommandController extends Controller {
data: { data: {
data: _command, data: _command,
issuerOrganizationName: issue, issuerOrganizationName: issue,
commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()), commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
commandYear: commandYear:
command.commandYear == null command.commandYear == null
? "" ? ""