(최겸) 구매 협력업체 정기평가, 가입승인, 기본계약 리비전 등

1 files changed, 7 insertions, 5 deletions

diff --git a/lib/evaluation-submit/evaluation-form.tsx b/lib/evaluation-submit/evaluation-form.tsx
index fbdcee69..d51a0369 100644
--- a/lib/evaluation-submit/evaluation-form.tsx
+++ b/lib/evaluation-submit/evaluation-form.tsx
@@ -90,13 +90,15 @@ export function EvaluationForm({ formData, onSubmit }: EvaluationFormProps) {
     questions.forEach(question => {
       const isVariable = question.scoreType === 'variable'
 
+      // 선택된 답변 옵션 찾기
+      const selectedOption = question.selectedDetailId ?
+        question.availableOptions.find(opt => opt.detailId === question.selectedDetailId) : null;
+
       initial[question.criteriaId] = {
         detailId: isVariable ? -1 : question.selectedDetailId,
         score: isVariable ?
-          question.currentScore || null :
-          (question.selectedDetailId ?
-            question.availableOptions.find(opt => opt.detailId === question.selectedDetailId)?.score || question.currentScore || null
-            : question.currentScore || null),
+          (question.currentScore ? Number(question.currentScore) : null) :
+          (selectedOption?.score ?? (question.currentScore ? Number(question.currentScore) : null)),
         comment: question.currentComment || "",
       }
     })
@@ -108,7 +110,7 @@ export function EvaluationForm({ formData, onSubmit }: EvaluationFormProps) {
     console.log('Initializing attachments from server data...')
     const initial: Record<number, AttachmentInfo[]> = {}
     questions.forEach(question => {
-      const questionAttachments = question.attachments || []
+      const questionAttachments = Array.isArray(question.attachments) ? question.attachments : []
       initial[question.criteriaId] = questionAttachments
       if (questionAttachments.length > 0) {
         console.log(`Question ${question.criteriaId} has ${questionAttachments.length} attachments:`, questionAttachments)