diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index f48ac65b..e4c6382c 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -941,11 +941,11 @@ export class CommandController extends Controller {
       detailFooter: command.detailFooter,
       commandDate:
         command.commandAffectDate == null
-          ? null
+          ? ""
           : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
       commandExcecuteDate:
         command.commandExcecuteDate == null
-          ? null
+          ? ""
           : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandExcecuteDate)),
       name: "...................................",
       position: "...................................",
@@ -984,11 +984,11 @@ export class CommandController extends Controller {
       detailFooter: command.detailFooter,
       commandDate:
         command.commandAffectDate == null
-          ? null
+          ? ""
           : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
       commandExcecuteDate:
         command.commandExcecuteDate == null
-          ? null
+          ? ""
           : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandExcecuteDate)),
       name: "...................................",
       position: "...................................",