diff --git a/backend-node/src/services/dynamicFormService.ts b/backend-node/src/services/dynamicFormService.ts
index 965d2833..5ca787a4 100644
--- a/backend-node/src/services/dynamicFormService.ts
+++ b/backend-node/src/services/dynamicFormService.ts
@@ -496,16 +496,27 @@ export class DynamicFormService {
         for (const repeater of mergedRepeaterData) {
           for (const item of repeater.data) {
             // 헤더 + 품목을 병합
-            const mergedData = { ...dataToInsert, ...item };
+            const rawMergedData = { ...dataToInsert, ...item };
             
-            // 타입 변환
-            Object.keys(mergedData).forEach((columnName) => {
-              const column = columnInfo.find((col) => col.column_name === columnName);
-              if (column) {
-                mergedData[columnName] = this.convertValueForPostgreSQL(
-                  mergedData[columnName],
-                  column.data_type
-                );
+            // 🆕 실제 테이블 컬럼만 필터링 (조인/계산 컬럼 제외)
+            const validColumnNames = columnInfo.map((col) => col.column_name);
+            const mergedData: Record<string, any> = {};
+            
+            Object.keys(rawMergedData).forEach((columnName) => {
+              // 실제 테이블 컬럼인지 확인
+              if (validColumnNames.includes(columnName)) {
+                const column = columnInfo.find((col) => col.column_name === columnName);
+                if (column) {
+                  // 타입 변환
+                  mergedData[columnName] = this.convertValueForPostgreSQL(
+                    rawMergedData[columnName],
+                    column.data_type
+                  );
+                } else {
+                  mergedData[columnName] = rawMergedData[columnName];
+                }
+              } else {
+                console.log(`⚠️ 조인/계산 컬럼 제외: ${columnName} (값: ${rawMergedData[columnName]})`);
               }
             });
             
diff --git a/frontend/components/screen/EditModal.tsx b/frontend/components/screen/EditModal.tsx
index 776eea83..5dec9266 100644
--- a/frontend/components/screen/EditModal.tsx
+++ b/frontend/components/screen/EditModal.tsx
@@ -323,7 +323,7 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
             continue;
           }
 
-          // 변경된 필드만 추출
+      // 변경된 필드만 추출
           const changedData: Record<string, any> = {};
           
           // 🆕 sales_order_mng 테이블의 실제 컬럼만 포함 (조인된 컬럼 제외)
@@ -572,10 +572,10 @@ export const EditModal: React.FC<EditModalProps> = ({ className }) => {
                           );
                         }
                       } else {
-                        setFormData((prev) => ({
-                          ...prev,
-                          [fieldName]: value,
-                        }));
+                      setFormData((prev) => ({
+                        ...prev,
+                        [fieldName]: value,
+                      }));
                       }
                     }}
                     screenInfo={{
diff --git a/frontend/lib/registry/components/conditional-container/ConditionalSectionViewer.tsx b/frontend/lib/registry/components/conditional-container/ConditionalSectionViewer.tsx
index d402f4df..f77dbcdb 100644
--- a/frontend/lib/registry/components/conditional-container/ConditionalSectionViewer.tsx
+++ b/frontend/lib/registry/components/conditional-container/ConditionalSectionViewer.tsx
@@ -142,7 +142,7 @@ export function ConditionalSectionViewer({
                   
                   return (
                     <div
-                      key={component.id}
+                    key={component.id}
                       className="absolute"
                       style={{
                         left: position.x || 0,
@@ -153,17 +153,17 @@ export function ConditionalSectionViewer({
                       }}
                     >
                       <DynamicComponentRenderer
-                        component={component}
+                    component={component}
                         isInteractive={true}
-                        screenId={screenInfo?.id}
-                        tableName={screenInfo?.tableName}
-                        userId={userId}
-                        userName={userName}
-                        companyCode={user?.companyCode}
-                        formData={formData}
-                        onFormDataChange={onFormDataChange}
+                    screenId={screenInfo?.id}
+                    tableName={screenInfo?.tableName}
+                    userId={userId}
+                    userName={userName}
+                    companyCode={user?.companyCode}
+                    formData={formData}
+                    onFormDataChange={onFormDataChange}
                         groupedData={groupedData}
-                      />
+                  />
                     </div>
                   );
                 })}