From 914f3d57f33ffd2bc0aa14da820505d00c0c7814 Mon Sep 17 00:00:00 2001
From: SeongHyun Kim <kksh7842@gmail.com>
Date: Mon, 5 Jan 2026 13:58:13 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20TableList=20=EC=B9=B4=ED=85=8C=EA=B3=A0?=
 =?UTF-8?q?=EB=A6=AC=20=EB=9D=BC=EB=B2=A8=20=ED=91=9C=EC=8B=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=9C=20=EB=A9=80=ED=8B=B0=ED=85=8C=EB=84=8C?=
 =?UTF-8?q?=EC=8B=9C=20fallback=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=20getColumnInputTypes=20API=EC=97=90=EC=84=9C=20=ED=9A=8C?=
 =?UTF-8?q?=EC=82=AC=EB=B3=84=20=EC=84=A4=EC=A0=95=EC=9D=B4=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EA=B8=B0=EB=B3=B8=EC=84=A4=EC=A0=95()?=
 =?UTF-8?q?=20fallback=20=EC=A0=81=EC=9A=A9=20table=5Ftype=5Fcolumns,=20ca?=
 =?UTF-8?q?tegory=5Fcolumn=5Fmapping=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20DI?=
 =?UTF-8?q?STINCT=20ON=20+=20ORDER=20BY=20CASE=20WHEN=20=ED=8C=A8=ED=84=B4?=
 =?UTF-8?q?=20=EC=82=AC=EC=9A=A9=20=EC=98=81=ED=96=A5=20=EB=B2=94=EC=9C=84?=
 =?UTF-8?q?:=20=EB=AA=A8=EB=93=A0=20TableList=20=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=EC=9D=98=20=EC=B9=B4=ED=85=8C=EA=B3=A0?=
 =?UTF-8?q?=EB=A6=AC=20=EC=BB=AC=EB=9F=BC=20=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/services/tableManagementService.ts     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend-node/src/services/tableManagementService.ts b/backend-node/src/services/tableManagementService.ts
index b714b186..def9a978 100644
--- a/backend-node/src/services/tableManagementService.ts
+++ b/backend-node/src/services/tableManagementService.ts
@@ -3930,9 +3930,10 @@ export class TableManagementService {
         `컬럼 입력타입 정보 조회: ${tableName}, company: ${companyCode}`
       );
 
-      // table_type_columns에서 입력타입 정보 조회 (company_code 필터링)
+      // table_type_columns에서 입력타입 정보 조회
+      // 회사별 설정 우선, 없으면 기본 설정(*) fallback
       const rawInputTypes = await query<any>(
-        `SELECT 
+        `SELECT DISTINCT ON (ttc.column_name)
           ttc.column_name as "columnName",
           COALESCE(cl.column_label, ttc.column_name) as "displayName",
           ttc.input_type as "inputType",
@@ -3946,8 +3947,10 @@ export class TableManagementService {
         LEFT JOIN information_schema.columns ic 
           ON ttc.table_name = ic.table_name AND ttc.column_name = ic.column_name
         WHERE ttc.table_name = $1 
-          AND ttc.company_code = $2
-        ORDER BY ttc.display_order, ttc.column_name`,
+          AND ttc.company_code IN ($2, '*')
+        ORDER BY ttc.column_name, 
+          CASE WHEN ttc.company_code = $2 THEN 0 ELSE 1 END,
+          ttc.display_order`,
         [tableName, companyCode]
       );
 
@@ -3961,17 +3964,20 @@ export class TableManagementService {
       const mappingTableExists = tableExistsResult[0]?.table_exists === true;
 
       // 카테고리 컬럼의 경우, 매핑된 메뉴 목록 조회
+      // 회사별 설정 우선, 없으면 기본 설정(*) fallback
       let categoryMappings: Map<string, number[]> = new Map();
       if (mappingTableExists) {
         logger.info("카테고리 매핑 조회 시작", { tableName, companyCode });
 
         const mappings = await query<any>(
-          `SELECT 
+          `SELECT DISTINCT ON (logical_column_name, menu_objid)
             logical_column_name as "columnName",
             menu_objid as "menuObjid"
           FROM category_column_mapping
           WHERE table_name = $1 
-            AND company_code = $2`,
+            AND company_code IN ($2, '*')
+          ORDER BY logical_column_name, menu_objid,
+            CASE WHEN company_code = $2 THEN 0 ELSE 1 END`,
           [tableName, companyCode]
         );