代码生成：增加主子表的示例

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm

@@ -25,9 +25,6 @@ import ${basePackage}.module.${subTable.moduleName}.dal.mysql.${subTable.busines
 import static ${ServiceExceptionUtilClassName}.exception;
 import static ${basePackage}.module.${table.moduleName}.enums.ErrorCodeConstants.*;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.ListUtil;
-
 /**
  * ${table.classComment} Service 实现类
  *
@@ -58,7 +55,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
 ## 特殊：主子表专属逻辑
 #if ( $subTables && $subTables.size() > 0)
 
-        // 插入子表（$subTable.classComment）
+        // 插入子表
 #foreach ($subTable in $subTables)
 #set ($index = $foreach.count - 1)
 #set ($subSimpleClassName = $subSimpleClassNames.get($index))
@@ -210,18 +207,26 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
 
     private void update${subSimpleClassName}List(${primaryColumn.javaType} ${subJoinColumn.javaField}, List<${subTable.className}DO> list) {
         delete${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField});
+		list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新
         create${subSimpleClassName}List(${subJoinColumn.javaField}, list);
     }
 
     #else
     private void create${subSimpleClassName}(${primaryColumn.javaType} ${subJoinColumn.javaField}, ${subTable.className}DO ${subClassNameVar}) {
+        if (${subClassNameVar} == null) {
+            return;
+        }
         ${subClassNameVar}.set$SubJoinColumnName(${subJoinColumn.javaField});
         ${subClassNameVars.get($index)}Mapper.insert(${subClassNameVar});
     }
 
     private void update${subSimpleClassName}(${primaryColumn.javaType} ${subJoinColumn.javaField}, ${subTable.className}DO ${subClassNameVar}) {
+        if (${subClassNameVar} == null) {
+			return;
+        }
         ${subClassNameVar}.set$SubJoinColumnName(${subJoinColumn.javaField});
-        ${subClassNameVars.get($index)}Mapper.updateById(${subClassNameVar});
+        ${subClassNameVar}.setUpdater(null).setUpdateTime(null); // 解决更新情况下：updateTime 不更新
+        ${subClassNameVars.get($index)}Mapper.insertOrUpdate(${subClassNameVar});
     }
 
     #end

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm

@@ -253,6 +253,7 @@
       #end
   #end
 #end
+  </el-form>
 #end
 </template>
 <script setup lang="ts">
@@ -278,32 +279,36 @@ const formRef = ref() // 表单 Ref
 watch(
   () => props.${subJoinColumn.javaField},
   async (val) => {
-    // 情况一：val 为空，说明是新增，则置空
-    if (!val) {
+    // 1. 重置表单
 #if ( $subTable.subJoinMany )
-      formData.value = []
+    formData.value = []
 #else
-      formData.value = {
-      #foreach ($column in $subColumns)
-        #if ($column.createOperation || $column.updateOperation)
-          #if ($column.htmlType == "checkbox")
-        $column.javaField: [],
-          #else
-        $column.javaField: undefined,
-          #end
+    formData.value = {
+    #foreach ($column in $subColumns)
+      #if ($column.createOperation || $column.updateOperation)
+        #if ($column.htmlType == "checkbox")
+      $column.javaField: [],
+        #else
+      $column.javaField: undefined,
         #end
       #end
-      }
+    #end
+    }
 #end
+    // 2. val 非空，则加载数据
+    if (!val) {
       return;
     }
-    // 情况二：val 非空，说明是修改，则加载数据
     try {
       formLoading.value = true
 #if ( $subTable.subJoinMany )
       formData.value = await ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(val)
 #else
-      formData.value = await ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(val)
+      const data = await ${simpleClassName}Api.get${subSimpleClassName}By${SubJoinColumnName}(val)
+      if (!data) {
+        return
+      }
+      formData.value = data
 #end
     } finally {
       formLoading.value = false

yudao-module-infra/yudao-module-infra-biz/src/main/resources/mapper/demo11/InfraDemo11StudentMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.infra.dal.mysql.demo11.InfraDemo11StudentMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>