diff --git a/src/main/java/ink/wgink/code/factory/service/GenerateService.java b/src/main/java/ink/wgink/code/factory/service/GenerateService.java index cde7fe2..fe2c693 100644 --- a/src/main/java/ink/wgink/code/factory/service/GenerateService.java +++ b/src/main/java/ink/wgink/code/factory/service/GenerateService.java @@ -173,19 +173,19 @@ public class GenerateService { if (!hasIsDelete && StringUtils.equals(FieldService.DEFAULT_FIELD_IS_DELETE, field.getPropertyName())) { hasIsDelete = true; } - if (!hasFile && StringUtils.equals(FormFieldTypeEnum.FILE.getValue(), field.getPropertyName())) { + if (!hasFile && StringUtils.equals(FormFieldTypeEnum.FILE.getValue(), field.getFormFieldValue())) { hasFile = true; } - if (!hasImage && StringUtils.equals(FormFieldTypeEnum.IMAGE.getValue(), field.getPropertyName())) { + if (!hasImage && StringUtils.equals(FormFieldTypeEnum.IMAGE.getValue(), field.getFormFieldValue())) { hasImage = true; } - if (!hasVideo && StringUtils.equals(FormFieldTypeEnum.VIDEO.getValue(), field.getPropertyName())) { + if (!hasVideo && StringUtils.equals(FormFieldTypeEnum.VIDEO.getValue(), field.getFormFieldValue())) { hasVideo = true; } - if (!hasAudio && StringUtils.equals(FormFieldTypeEnum.AUDIO.getValue(), field.getPropertyName())) { + if (!hasAudio && StringUtils.equals(FormFieldTypeEnum.AUDIO.getValue(), field.getFormFieldValue())) { hasAudio = true; } - if (!hasRichText && StringUtils.equals(FormFieldTypeEnum.RICH_TEXT.getValue(), field.getPropertyName())) { + if (!hasRichText && StringUtils.equals(FormFieldTypeEnum.RICH_TEXT.getValue(), field.getFormFieldValue())) { hasRichText = true; } Map fieldMap = new HashMap<>(16); diff --git a/src/main/resources/template/normal/mapper/mysql-mapper.ftl b/src/main/resources/template/normal/mapper/mysql-mapper.ftl index 2a560f9..1e89fe5 100644 --- a/src/main/resources/template/normal/mapper/mysql-mapper.ftl +++ b/src/main/resources/template/normal/mapper/mysql-mapper.ftl @@ -88,7 +88,7 @@ <#elseif field.formFieldValue == "radio" || field.formFieldValue == "checkbox" || field.formFieldValue == "select"> - ${field.columnName} = ${r"#{"}${field.propertyName}${r"}"},w + ${field.columnName} = ${r"#{"}${field.propertyName}${r"}"}, <#else> <#if hasId>