diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java
index 4a256df998326b56f185cc78a8d383ea91772b2f..3e407764290d3f8f0685985f7442e24fb824fdd1 100644
--- a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java
+++ b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java
@@ -8,13 +8,17 @@ import neatlogic.framework.common.constvalue.Expression;
 import neatlogic.framework.common.constvalue.ParamType;
 import neatlogic.framework.condition.core.ConditionHandlerFactory;
 import neatlogic.framework.condition.core.IConditionHandler;
+import neatlogic.framework.crossover.CrossoverServiceFactory;
 import neatlogic.framework.dto.ConditionParamVo;
 import neatlogic.framework.dto.ExpressionVo;
 import neatlogic.framework.form.attribute.core.FormAttributeHandlerFactory;
 import neatlogic.framework.form.attribute.core.IFormAttributeHandler;
 import neatlogic.framework.form.constvalue.FormConditionModel;
 import neatlogic.framework.form.dao.mapper.FormMapper;
+import neatlogic.framework.form.dto.FormAttributeParentVo;
 import neatlogic.framework.form.dto.FormAttributeVo;
+import neatlogic.framework.form.dto.FormVersionVo;
+import neatlogic.framework.form.service.IFormCrossoverService;
 import neatlogic.framework.process.auth.PROCESS_BASE;
 import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions;
 import neatlogic.framework.restful.annotation.*;
@@ -26,6 +30,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -92,55 +97,84 @@ public class ProcessConditionList extends PrivateApiComponentBase {
         // 表单条件
         String formUuid = jsonObj.getString("formUuid");
         if (StringUtils.isNotBlank(formUuid)) {
-            List<FormAttributeVo> formAttrList = formMapper.getFormAttributeList(new FormAttributeVo(formUuid));
-            for (FormAttributeVo formAttributeVo : formAttrList) {
+            Boolean isAll = jsonObj.getBoolean("isAll");
+            if (isAll == null || Boolean.FALSE.equals(isAll)) {
+                List<FormAttributeVo> formAttrList = formMapper.getFormAttributeList(new FormAttributeVo(formUuid));
+                for (FormAttributeVo formAttributeVo : formAttrList) {
 
-                IFormAttributeHandler formHandler = FormAttributeHandlerFactory.getHandler(formAttributeVo.getHandler());
-                if (formHandler == null) {
-                    continue;
-                }
-                if (formHandler.isConditionable()) {
-                    formAttributeVo.setType("form");
-                    formAttributeVo.setConditionModel(FormConditionModel.CUSTOM);
-                    ConditionParamVo conditionParamVo = new ConditionParamVo();
-                    conditionParamVo.setName(formAttributeVo.getUuid());
-                    conditionParamVo.setLabel(formAttributeVo.getLabel());
-                    conditionParamVo.setController(formAttributeVo.getHandlerType());
-                    conditionParamVo.setType(formAttributeVo.getType());
-                    conditionParamVo.setHandler(formAttributeVo.getHandler());
-                    conditionParamVo.setConfig(formAttributeVo.getConfig());
-                    if ("formdate".equals(formAttributeVo.getHandler())) {
-                        JSONObject config = conditionParamVo.getConfig();
-                        if (MapUtils.isNotEmpty(config)) {
-                            config.put("type", "datetimerange");
-                            conditionParamVo.setConfig(config.toJSONString());
-                        }
-                    } else if ("formtime".equals(formAttributeVo.getHandler())) {
-                        JSONObject config = conditionParamVo.getConfig();
-                        if (MapUtils.isNotEmpty(config)) {
-                            config.put("type", "timerange");
-                            conditionParamVo.setConfig(config.toJSONString());
-                        }
+                    IFormAttributeHandler formHandler = FormAttributeHandlerFactory.getHandler(formAttributeVo.getHandler());
+                    if (formHandler == null) {
+                        continue;
                     }
-                    ParamType paramType = formHandler.getParamType();
-                    if (paramType != null) {
-                        conditionParamVo.setParamType(paramType.getName());
-                        conditionParamVo.setParamTypeName(paramType.getText());
-                        Expression expression = paramType.getDefaultExpression();
-                        if (expression != null) {
-                            conditionParamVo.setDefaultExpression(expression.getExpression());
+                    if (formHandler.isConditionable()) {
+                        formAttributeVo.setType("form");
+                        formAttributeVo.setConditionModel(FormConditionModel.CUSTOM);
+                        ConditionParamVo conditionParamVo = new ConditionParamVo();
+                        conditionParamVo.setName(formAttributeVo.getUuid());
+                        conditionParamVo.setLabel(formAttributeVo.getLabel());
+                        conditionParamVo.setController(formAttributeVo.getHandlerType());
+                        conditionParamVo.setType(formAttributeVo.getType());
+                        conditionParamVo.setHandler(formAttributeVo.getHandler());
+                        conditionParamVo.setConfig(formAttributeVo.getConfig());
+                        if ("formdate".equals(formAttributeVo.getHandler())) {
+                            JSONObject config = conditionParamVo.getConfig();
+                            if (MapUtils.isNotEmpty(config)) {
+                                config.put("type", "datetimerange");
+                                conditionParamVo.setConfig(config.toJSONString());
+                            }
+                        } else if ("formtime".equals(formAttributeVo.getHandler())) {
+                            JSONObject config = conditionParamVo.getConfig();
+                            if (MapUtils.isNotEmpty(config)) {
+                                config.put("type", "timerange");
+                                conditionParamVo.setConfig(config.toJSONString());
+                            }
                         }
-                        if (CollectionUtils.isNotEmpty(paramType.getExpressionList())) {
-                            for (Expression exp : paramType.getExpressionList()) {
-                                conditionParamVo.getExpressionList().add(new ExpressionVo(exp));
+                        ParamType paramType = formHandler.getParamType();
+                        if (paramType != null) {
+                            conditionParamVo.setParamType(paramType.getName());
+                            conditionParamVo.setParamTypeName(paramType.getText());
+                            Expression expression = paramType.getDefaultExpression();
+                            if (expression != null) {
+                                conditionParamVo.setDefaultExpression(expression.getExpression());
+                            }
+                            if (CollectionUtils.isNotEmpty(paramType.getExpressionList())) {
+                                for (Expression exp : paramType.getExpressionList()) {
+                                    conditionParamVo.getExpressionList().add(new ExpressionVo(exp));
+                                }
                             }
                         }
+                        resultArray.add(conditionParamVo);
+                    }
+                }
+            } else {
+                FormVersionVo formVersion = formMapper.getActionFormVersionByFormUuid(formUuid);
+                if (formVersion != null) {
+                    IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class);
+                    List<FormAttributeVo> allFormAttributeList = formCrossoverService.getAllFormAttributeList(formVersion.getFormConfig());
+                    for (FormAttributeVo formAttributeVo : allFormAttributeList) {
+                        List<String> parentNameList = new ArrayList<>();
+                        FormAttributeParentVo parent = formAttributeVo.getParent();
+                        while (parent != null) {
+                            parentNameList.add(0, parent.getName());
+                            parent = parent.getParent();
+                        }
+                        parentNameList.add(formAttributeVo.getLabel());
+//                        String name = "['" + String.join("']['", parentNameList) + "']";
+                        String label = String.join("/", parentNameList);
+                        formAttributeVo.setType("form");
+                        formAttributeVo.setConditionModel(FormConditionModel.CUSTOM);
+                        ConditionParamVo conditionParamVo = new ConditionParamVo();
+                        conditionParamVo.setName(formAttributeVo.getUuid());
+                        conditionParamVo.setLabel(label);
+//                        conditionParamVo.setController(formAttributeVo.getHandlerType());
+                        conditionParamVo.setType(formAttributeVo.getType());
+                        conditionParamVo.setHandler(formAttributeVo.getHandler());
+                        conditionParamVo.setConfig(formAttributeVo.getConfig());
+                        resultArray.add(conditionParamVo);
                     }
-                    resultArray.add(conditionParamVo);
                 }
             }
         }
         return resultArray;
     }
-
 }