diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java
index 324266fd80dca444c4a07f8647bcdfba38a68e84..47be64c6c5d08dbed1b5e4fef8285cd6824e00dc 100644
--- a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java
+++ b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java
@@ -84,7 +84,7 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase {
 
     private final static Logger logger = LoggerFactory.getLogger(AutoexecProcessComponent.class);
 
-    private final String FORM_EXTEND_ATTRIBUTE_TAG = "common";
+//    private final String FORM_EXTEND_ATTRIBUTE_TAG = "common";
     @Resource
     private AutoexecJobMapper autoexecJobMapper;
 
@@ -320,10 +320,13 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase {
 //                processTaskFormAttributeDataMap = processTaskFormAttributeDataList.stream().collect(Collectors.toMap(e -> e.getAttributeUuid(), e -> e));
 //            }
 //        }
+        String formTag = autoexecConfig.getString("formTag");
         IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class);
-        List<FormAttributeVo> formAttributeList = processTaskCrossoverService.getFormAttributeListByProcessTaskIdAngTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG);
+//        List<FormAttributeVo> formAttributeList = processTaskCrossoverService.getFormAttributeListByProcessTaskIdAngTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG);
+        List<FormAttributeVo> formAttributeList = processTaskCrossoverService.getFormAttributeListByProcessTaskIdAngTagNew(processTaskId, formTag);
         if (CollectionUtils.isNotEmpty(formAttributeList)) {
-            List<ProcessTaskFormAttributeDataVo> processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG);
+//            List<ProcessTaskFormAttributeDataVo> processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG);
+            List<ProcessTaskFormAttributeDataVo> processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTagNew(processTaskId, formTag);
             // 添加表格组件中的子组件到组件列表中
             for (FormAttributeVo formAttributeVo : formAttributeList) {
                 formAttributeMap.put(formAttributeVo.getUuid(), formAttributeVo);
diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java b/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java
index 2da695e056341520b499639409d7b51f3ed9fb89..206eb635b9c51248554e6de6706ec6d0406b0c06 100644
--- a/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java
+++ b/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java
@@ -274,6 +274,11 @@ public class AutoexecProcessUtilHandler extends ProcessStepInternalHandlerBase {
                     id = SnowflakeUtil.uniqueLong();
                 }
                 configObj.put("id", id);
+                String formTag = config.getString("formTag");
+                if (StringUtils.isBlank(formTag)) {
+                    formTag = StringUtils.EMPTY;
+                }
+                configObj.put("formTag", formTag);
                 Long autoexecCombopId = config.getLong("autoexecCombopId");
                 if (autoexecCombopId != null) {
                     configObj.put("autoexecCombopId", autoexecCombopId);