From f59b795e2234780ae8b822fc87670af77902b8f1 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 27 Nov 2025 19:14:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(RDMP-3845)=20-=20=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=93=8D=E5=BA=94=E6=97=B6=EF=BC=8C=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E5=A4=8D=E9=80=89=E7=9A=84=20options=20=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/converter/FormFieldConverter.java     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/workflow-engine-form/src/main/java/cn/axzo/workflow/form/service/converter/FormFieldConverter.java b/workflow-engine-form/src/main/java/cn/axzo/workflow/form/service/converter/FormFieldConverter.java
index e9d46e2fa..130e3afb1 100644
--- a/workflow-engine-form/src/main/java/cn/axzo/workflow/form/service/converter/FormFieldConverter.java
+++ b/workflow-engine-form/src/main/java/cn/axzo/workflow/form/service/converter/FormFieldConverter.java
@@ -3,6 +3,7 @@ package cn.axzo.workflow.form.service.converter;
 import cn.axzo.workflow.common.model.request.form.definition.FormFieldDTO;
 import org.flowable.form.model.FormContainer;
 import org.flowable.form.model.FormField;
+import org.flowable.form.model.OptionFormField;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
@@ -34,6 +35,16 @@ public interface FormFieldConverter extends EntityConverter<FormFieldDTO, FormFi
     @Mapping(target = "params", source = "entity.params")
     FormFieldDTO toVo(FormField entity);
 
+    @Mapping(target = "fieldType", expression = "java(entity.getClass().getSimpleName())")
+    @Mapping(target = "id", source = "entity.id")
+    @Mapping(target = "name", source = "entity.name")
+    @Mapping(target = "type", source = "entity.type")
+    @Mapping(target = "value", expression = "java(ConversionUtils.convertObject(entity.getValue()))")
+    @Mapping(target = "placeholder", source = "entity.placeholder")
+    @Mapping(target = "params", source = "entity.params")
+    @Mapping(target = "options", source = "entity.options")
+    FormFieldDTO toVo(OptionFormField entity);
+
     @Mapping(target = "fieldType", expression = "java(entity.getClass().getSimpleName())")
     @Mapping(target = "id", source = "entity.id")
     @Mapping(target = "name", source = "entity.name")
@@ -50,7 +61,9 @@ public interface FormFieldConverter extends EntityConverter<FormFieldDTO, FormFi
         for (FormField entity : entities) {
             if(entity instanceof FormContainer) {
                 dtos.add(toVo((FormContainer) entity));
-            } else{
+            } else if (entity instanceof OptionFormField) {
+                dtos.add(toVo((OptionFormField) entity));
+            } else {
                 dtos.add(toVo((FormField) entity));
             }
         }