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

---
 src/controllers/CommandController.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 4630a4f1..5fda4063 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -343,9 +343,11 @@ export class CommandController extends Controller {
       .andWhere(
         new Brackets((qb) => {
           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", {
@@ -356,14 +358,6 @@ export class CommandController extends Controller {
               {
                 keyword: `%${keyword}%`,
               },
-            )
-            .orWhere(
-              keyword != null && keyword != ""
-                ? "CONCAT(command.shortName, ' ', command.commandNo) LIKE :keyword"
-                : "1=1",
-              {
-                keyword: `%${keyword}%`,
-              },
             );
         }),
       )