diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java
index aea0745..fc046bb 100644
--- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java
+++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminActivityFormServiceImpl.java
@@ -172,7 +172,7 @@ public class AdminActivityFormServiceImpl implements IAdminActivityFormService {
                 fieldEntity.setFieldCode(fieldCode);
 
                 // 设置字段类型
-                String fieldType = (String) fieldMap.get("tag");
+                String fieldType = (String) config.get("tagIcon");
                 if (fieldType == null) {
                     fieldType = (String) config.get("tag");
                 }
diff --git a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java
index fdd8f54..0708fa8 100644
--- a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java
+++ b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java
@@ -1,9 +1,10 @@
 package com.seer.teach.mp.app.service.impl;
 
-import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.seer.teach.common.PageListBean;
+import com.seer.teach.common.utils.OrderIdGenerator;
 import com.seer.teach.common.utils.PageConverterUtils;
 import com.seer.teach.mp.app.controller.req.ActivityFormSubmitReq;
 import com.seer.teach.mp.app.controller.req.AppActivityFormExecutionQueryReq;
@@ -108,7 +109,7 @@ public class AppActivityFormServiceImpl implements IAppActivityFormService {
     @Transactional
     public String submitForm(ActivityFormSubmitReq req, Integer userId) {
         // 生成执行编号
-        String executionNo = "AFE-" + System.currentTimeMillis() + "-" + IdUtil.getSnowflakeNextId();
+        String executionNo = OrderIdGenerator.generateOrderId("EX");
         
         // 创建表单执行实例
         MpActivityFormExecutionEntity execution = new MpActivityFormExecutionEntity();
@@ -124,17 +125,18 @@ public class AppActivityFormServiceImpl implements IAppActivityFormService {
         activityFormExecutionService.save(execution);
         
         // 处理表单数据，将其存储到变量表中
-        if (req.getFormData() != null && !req.getFormData().isEmpty()) {
-            for (Map.Entry<String, Object> entry : req.getFormData().entrySet()) {
-                MpActivityFormVariableEntity variable = new MpActivityFormVariableEntity();
-                variable.setExecutionId(execution.getId());
-                variable.setVariableName(entry.getKey());
-                variable.setVariableCode(entry.getKey());
-                variable.setVariableValue(String.valueOf(entry.getValue()));
-                variable.setDataType(getDataType(entry.getValue()));
-                
-                activityFormVariableService.save(variable);
-            }
+        if (CollectionUtil.isNotEmpty(req.getFormData())) {
+            List<MpActivityFormVariableEntity> variables = req.getFormData().entrySet().stream()
+                .map(entry -> {
+                    MpActivityFormVariableEntity variable = new MpActivityFormVariableEntity();
+                    variable.setExecutionId(execution.getId());
+                    variable.setVariableName(entry.getKey());
+                    variable.setVariableCode(entry.getKey());
+                    variable.setVariableValue(String.valueOf(entry.getValue()));
+                    variable.setDataType(getDataType(entry.getValue()));
+                    return variable;
+                }).collect(Collectors.toList());
+            activityFormVariableService.saveBatch(variables);
         }
         
         log.info("表单提交成功，执行编号：{}", executionNo);