admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 09:08:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

!498 fix:代码生成器异常

Browse Source 
* fix:代码生成模板 isNotBlank替换为hasText. entityWithBase.kotlin.tpl 添加 open
This commit is contained in:
落羽er 2024-10-31 22:45:45 +00:00 committed by Michael Yang
parent cc86d94b7f
commit 8526fcd735
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mybatis-flex-codegen/src/main/resources/templates/enjoy/entity.kotlin.tpl
View File

@ -30,13 +30,13 @@ import io.swagger.v3.oas.annotations.media.Schema
open class #(entityClassName) #if(withActiveRecord) : Model<#(entityClassName)>()#else#(table.buildKtExtends(isBase))#end { open class #(entityClassName) #if(withActiveRecord) : Model<#(entityClassName)>()#else#(table.buildKtExtends(isBase))#end {
#for(column : table.columns) #for(column : table.columns)
#set(comment = javadocConfig.formatColumnComment(column.comment)) #set(comment = javadocConfig.formatColumnComment(column.comment))
#if(isNotBlank(comment)) #if(hasText(comment))
/** /**
* #(comment) * #(comment)
*/ */
#end #end
#set(annotations = column.buildAnnotations()) #set(annotations = column.buildAnnotations())
#if(isNotBlank(annotations)) #if(hasText(annotations))
#(annotations) #(annotations)
#end #end
#if(withSwagger && swaggerVersion.getName() == "FOX") #if(withSwagger && swaggerVersion.getName() == "FOX")
@ -45,7 +45,7 @@ open class #(entityClassName) #if(withActiveRecord) : Model<#(entityClassName)>(
#if(withSwagger && swaggerVersion.getName() == "DOC") #if(withSwagger && swaggerVersion.getName() == "DOC")
@Schema(description = "#(column.comment)") @Schema(description = "#(column.comment)")
#end #end
open var #(column.property): #(column.propertySimpleType)? = #if(isNotBlank(column.propertyDefaultValue)) = #(column.propertyDefaultValue)#else null#end open var #(column.property): #(column.propertySimpleType)? = #if(hasText(column.propertyDefaultValue)) = #(column.propertyDefaultValue)#else null#end
#end #end
} }

6
mybatis-flex-codegen/src/main/resources/templates/enjoy/entityOrBase.tpl
View File

@ -77,13 +77,13 @@ public class #(entityClassName)#if(withActiveRecord) extends Model<#(entityClass
#for(column : table.columns) #for(column : table.columns)
#set(comment = javadocConfig.formatColumnComment(column.comment)) #set(comment = javadocConfig.formatColumnComment(column.comment))
#if(isNotBlank(comment)) #if(hasText(comment))
/** /**
* #(comment) * #(comment)
*/ */
#end #end
#set(annotations = column.buildAnnotations()) #set(annotations = column.buildAnnotations())
#if(isNotBlank(annotations)) #if(hasText(annotations))
#(annotations) #(annotations)
#end #end
#if(withSwagger && swaggerVersion.getName() == "FOX") #if(withSwagger && swaggerVersion.getName() == "FOX")
@ -92,7 +92,7 @@ public class #(entityClassName)#if(withActiveRecord) extends Model<#(entityClass
#if(withSwagger && swaggerVersion.getName() == "DOC") #if(withSwagger && swaggerVersion.getName() == "DOC")
@Schema(description = "#(column.comment)") @Schema(description = "#(column.comment)")
#end #end
private #(column.propertySimpleType) #(column.property)#if(isNotBlank(column.propertyDefaultValue)) = #(column.propertyDefaultValue)#end; private #(column.propertySimpleType) #(column.property)#if(hasText(column.propertyDefaultValue)) = #(column.propertyDefaultValue)#end;
#end #end
#if(!withLombok) #if(!withLombok)

2
mybatis-flex-codegen/src/main/resources/templates/enjoy/entityWithBase.kotlin.tpl
View File

@ -32,4 +32,4 @@ import io.swagger.v3.oas.annotations.media.Schema
@Schema(description = "#(table.getComment())") @Schema(description = "#(table.getComment())")
#end #end
#if(!isBase)#(table.buildTableAnnotation())#end #if(!isBase)#(table.buildTableAnnotation())#end
class #(entityClassName) : #(baseClassName)() open class #(entityClassName) : #(baseClassName)()