From 2fc1ef519dfd4ef3c9f6208258882ad50ec1faf3 Mon Sep 17 00:00:00 2001 From: liu xm Date: Mon, 8 Nov 2021 13:27:34 +0800 Subject: [PATCH] 修复基于建表SQL生成代码 列名没有COMMENT注释报错的问题 --- yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java index 7a79f05..bb664a1 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java @@ -16,6 +16,7 @@ import org.apache.commons.collections4.keyvalue.DefaultKeyValue; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import static com.alibaba.druid.sql.SQLUtils.normalize; @@ -97,7 +98,8 @@ public class ToolCodegenSQLParser { columns.add(ToolSchemaColumnDO.builder() .columnName(normalize(definition.getColumnName())) .columnType(definition.getDataType().toString()) - .columnComment(normalize(definition.getComment().toString())) + .columnComment(Objects.isNull(definition.getComment()) ? "" + : normalize(definition.getComment().toString())) .nullable(!text.contains(" NOT NULL")) .primaryKey(false) .autoIncrement(text.contains("AUTO_INCREMENT")) -- libgit2 0.21.4