2 files changed, 24 insertions, 1 deletions
diff --git a/lib/dolce/table/detail-drawing-columns.tsx b/lib/dolce/table/detail-drawing-columns.tsx
index 30290817..215a0cff 100644
--- a/lib/dolce/table/detail-drawing-columns.tsx
+++ b/lib/dolce/table/detail-drawing-columns.tsx
@@ -104,7 +104,7 @@ export function createDetailDrawingColumns(
       minSize: 180,
       cell: ({ row }) => {
         // 항상 RegisterKindENM 필드를 보여줌
-        return <div>{row.getValue("RegisterKindENM")}</div>;
+        return <div>{row.getValue("RegisterKindENM") || row.original.RegisterKind}</div>;
       },
     },
     {
@@ -114,6 +114,11 @@ export function createDetailDrawingColumns(
       cell: ({ row }) => {
         const userENM = row.original.CreateUserENM;
         const userNM = row.getValue("CreateUserNM") as string;
+        
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const localUserName = (row.original as any).userName;
+        if (localUserName) return <div>{localUserName}</div>;
+
         return <div>{lng === "en" ? (userENM || userNM) : (userNM || userENM)}</div>;
       },
     },
diff --git a/lib/dolce/utils/date-formatter.ts b/lib/dolce/utils/date-formatter.ts
index 83e78b0d..ebf9653a 100644
--- a/lib/dolce/utils/date-formatter.ts
+++ b/lib/dolce/utils/date-formatter.ts
@@ -6,12 +6,30 @@
  */
 
 import { formatSwpDate } from "@/lib/swp/utils";
+import { format, parseISO, isValid } from "date-fns";
 
 /**
  * SWP와 동일한 방식
+ * Postgres Date 타입(ISO String) 처리 추가
  */
 export function formatDolceDateTime(dateStr: string | null): string {
   if (!dateStr) return "-";
+
+  // ISO string check (e.g. "2023-11-27T10:20:30.000Z" or similar)
+  if (dateStr.includes("-") && (dateStr.includes("T") || dateStr.includes(":"))) {
+    try {
+      const date = parseISO(dateStr);
+      if (isValid(date)) {
+        // Requested format: YYYY-MM-DD AM/PM HH:mm:ss
+        // date-fns format: yyyy-MM-dd a hh:mm:ss
+        return format(date, "yyyy-MM-dd a hh:mm:ss");
+      }
+    } catch (e) {
+      // ignore parse error, fallback to default
+      console.error("Date parse error", e);
+    }
+  }
+
   return formatSwpDate(dateStr);
 }