BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 62f7d349520545409eff471fad6da5b4914687a7

Authored by YunaiV
1 parent bf7c6db5

修复代码生成导入的异常

Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
  View file @62f7d34
... ... @@ -82,7 +82,7 @@ public class CodegenServiceImpl implements CodegenService {
82 82 table.setAuthor(userApi.getUser(userId).getNickname());
83 83 codegenTableMapper.insert(table);
84 84 // 构建 CodegenColumnDO 数组，插入到 DB 中
85   - List<CodegenColumnDO> columns = codegenBuilder.buildColumns(schemaColumns);
  85 + List<CodegenColumnDO> columns = codegenBuilder.buildColumns(table.getId(), schemaColumns);
86 86 codegenColumnMapper.insertBatch(columns);
87 87 return table.getId();
88 88 }
... ... @@ -196,7 +196,7 @@ public class CodegenServiceImpl implements CodegenService {
196 196 }
197 197  
198 198 // 插入新增的字段
199   - List<CodegenColumnDO> columns = codegenBuilder.buildColumns(schemaColumns);
  199 + List<CodegenColumnDO> columns = codegenBuilder.buildColumns(tableId, schemaColumns);
200 200 codegenColumnMapper.insertBatch(columns);
201 201 // 删除不存在的字段
202 202 if (CollUtil.isNotEmpty(deleteColumnIds)) {
... ...
yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilder.java
  View file @62f7d34
... ... @@ -133,9 +133,12 @@ public class CodegenBuilder {
133 133 table.setTemplateType(CodegenTemplateTypeEnum.CRUD.getType());
134 134 }
135 135  
136   - public List<CodegenColumnDO> buildColumns(List<SchemaColumnDO> schemaColumns) {
  136 + public List<CodegenColumnDO> buildColumns(Long tableId, List<SchemaColumnDO> schemaColumns) {
137 137 List<CodegenColumnDO> columns = CodegenConvert.INSTANCE.convertList(schemaColumns);
138   - columns.forEach(this::initColumnDefault);
  138 + for (CodegenColumnDO column : columns) {
  139 + column.setTableId(tableId);
  140 + initColumnDefault(column);
  141 + }
139 142 return columns;
140 143 }
141 144  
... ...