Tenlion/code-factory
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理代码模板问题

Browse Source
This commit is contained in:
wanggeng 2021-11-05 00:42:19 +08:00
parent c85899ba9b
commit 2da510fd16
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/ink/wgink/code/factory/service/GenerateService.java
View File

@ -173,19 +173,19 @@ public class GenerateService {
if (!hasIsDelete && StringUtils.equals(FieldService.DEFAULT_FIELD_IS_DELETE, field.getPropertyName())) { if (!hasIsDelete && StringUtils.equals(FieldService.DEFAULT_FIELD_IS_DELETE, field.getPropertyName())) {
hasIsDelete = true; hasIsDelete = true;
} }
if (!hasFile && StringUtils.equals(FormFieldTypeEnum.FILE.getValue(), field.getPropertyName())) { if (!hasFile && StringUtils.equals(FormFieldTypeEnum.FILE.getValue(), field.getFormFieldValue())) {
hasFile = true; hasFile = true;
} }
if (!hasImage && StringUtils.equals(FormFieldTypeEnum.IMAGE.getValue(), field.getPropertyName())) { if (!hasImage && StringUtils.equals(FormFieldTypeEnum.IMAGE.getValue(), field.getFormFieldValue())) {
hasImage = true; hasImage = true;
} }
if (!hasVideo && StringUtils.equals(FormFieldTypeEnum.VIDEO.getValue(), field.getPropertyName())) { if (!hasVideo && StringUtils.equals(FormFieldTypeEnum.VIDEO.getValue(), field.getFormFieldValue())) {
hasVideo = true; hasVideo = true;
} }
if (!hasAudio && StringUtils.equals(FormFieldTypeEnum.AUDIO.getValue(), field.getPropertyName())) { if (!hasAudio && StringUtils.equals(FormFieldTypeEnum.AUDIO.getValue(), field.getFormFieldValue())) {
hasAudio = true; hasAudio = true;
} }
if (!hasRichText && StringUtils.equals(FormFieldTypeEnum.RICH_TEXT.getValue(), field.getPropertyName())) { if (!hasRichText && StringUtils.equals(FormFieldTypeEnum.RICH_TEXT.getValue(), field.getFormFieldValue())) {
hasRichText = true; hasRichText = true;
} }
Map<String, Object> fieldMap = new HashMap<>(16); Map<String, Object> fieldMap = new HashMap<>(16);

2
src/main/resources/template/normal/mapper/mysql-mapper.ftl
View File

@ -88,7 +88,7 @@
</if> </if>
<#elseif field.formFieldValue == "radio" || field.formFieldValue == "checkbox" || field.formFieldValue == "select"> <#elseif field.formFieldValue == "radio" || field.formFieldValue == "checkbox" || field.formFieldValue == "select">
<if test="${field.propertyName} != null"> <if test="${field.propertyName} != null">
${field.columnName} = ${r"#{"}${field.propertyName}${r"}"},w ${field.columnName} = ${r"#{"}${field.propertyName}${r"}"},
</if> </if>
<#else> <#else>
<#if hasId> <#if hasId>