From 3c86af9169d51486bc8503587b56c4d1e9fd5ce8 Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Thu, 26 Sep 2024 17:37:20 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=88=20report?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/CommandController.ts | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 3c38a25d..72c72ba9 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -869,10 +869,14 @@ export class CommandController extends Controller {
       detailHeader: command.detailHeader,
       detailBody: command.detailBody,
       detailFooter: command.detailFooter,
-      commandDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
-      commandExcecuteDate: Extension.ToThaiNumber(
-        Extension.ToThaiFullDate2(command.commandExcecuteDate),
-      ),
+      commandDate:
+        command.commandAffectDate == null
+          ? null
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
+      commandExcecuteDate:
+        command.commandExcecuteDate == null
+          ? null
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandExcecuteDate)),
       name: "...................................",
       position: "...................................",
     };
@@ -908,10 +912,14 @@ export class CommandController extends Controller {
       detailHeader: command.detailHeader,
       detailBody: command.detailBody,
       detailFooter: command.detailFooter,
-      commandDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
-      commandExcecuteDate: Extension.ToThaiNumber(
-        Extension.ToThaiFullDate2(command.commandExcecuteDate),
-      ),
+      commandDate:
+        command.commandAffectDate == null
+          ? null
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
+      commandExcecuteDate:
+        command.commandExcecuteDate == null
+          ? null
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandExcecuteDate)),
       name: "...................................",
       position: "...................................",
     };