From bc418666aceb5c8f37f779062f4492561a5150d8 Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Tue, 26 May 2026 16:13:53 +0700
Subject: [PATCH] fix search commandNo #242

---
 src/controllers/CommandController.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 5440f3b7..4630a4f1 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -356,6 +356,14 @@ export class CommandController extends Controller {
               {
                 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)) {
       _command = {
         issue: issue,
-        commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()),
+        commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
         commandYear:
           command.commandYear == null
             ? ""
@@ -2264,7 +2272,7 @@ export class CommandController extends Controller {
       );
       _command = {
         issue: issue,
-        commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()),
+        commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
         commandYear:
           command.commandYear == null
             ? ""
@@ -2403,7 +2411,7 @@ export class CommandController extends Controller {
       data: {
         data: _command,
         issuerOrganizationName: issue,
-        commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()),
+        commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
         commandYear:
           command.commandYear == null
             ? ""
@@ -8723,7 +8731,7 @@ export class CommandController extends Controller {
     if (issue == null) issue = "...................................";
     const _command = {
       issue: issue,
-      commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()),
+      commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
       commandYear:
         command.commandYear == null
           ? ""
@@ -8828,7 +8836,7 @@ export class CommandController extends Controller {
       data: {
         data: _command,
         issuerOrganizationName: issue,
-        commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(`${command.shortName ?? ""} ${command.commandNo}`.trim()),
+        commandNo: command.commandNo == null ? "" : Extension.ToThaiNumber(command.commandNo),
         commandYear:
           command.commandYear == null
             ? ""