Selaa lähdekoodia

!55 修复基于建表SQL生成代码 列名没有COMMENT注释报错的问题
Merge pull request !55 from 夜丶点缀了一个人的落寞/hotfix-tool-codegen

芋道源码 3 vuotta sitten
vanhempi
commit
c84e19e14e

+ 3 - 1
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"))