Commit 0f4935c7 authored by hewei's avatar hewei

bug:增量插件重构时,对于没有配置增量列的model也错误的生成了增量相关字段

parent b7eda65b
...@@ -157,6 +157,7 @@ public class IncrementsPlugin extends BasePlugin implements IModelBuilderPluginH ...@@ -157,6 +157,7 @@ public class IncrementsPlugin extends BasePlugin implements IModelBuilderPluginH
*/ */
@Override @Override
public boolean modelBuilderClassGenerated(TopLevelClass topLevelClass, InnerClass builderClass, List<IntrospectedColumn> columns, IntrospectedTable introspectedTable) { public boolean modelBuilderClassGenerated(TopLevelClass topLevelClass, InnerClass builderClass, List<IntrospectedColumn> columns, IntrospectedTable introspectedTable) {
if (incTools.support()) {
// 增加枚举 // 增加枚举
InnerEnum eIncrements = new InnerEnum(new FullyQualifiedJavaType("Inc")); InnerEnum eIncrements = new InnerEnum(new FullyQualifiedJavaType("Inc"));
eIncrements.setVisibility(JavaVisibility.PUBLIC); eIncrements.setVisibility(JavaVisibility.PUBLIC);
...@@ -234,6 +235,7 @@ public class IncrementsPlugin extends BasePlugin implements IModelBuilderPluginH ...@@ -234,6 +235,7 @@ public class IncrementsPlugin extends BasePlugin implements IModelBuilderPluginH
FormatTools.addMethodWithBestPosition(builderClass, mIncrements); FormatTools.addMethodWithBestPosition(builderClass, mIncrements);
} }
} }
}
return true; return true;
} }
...@@ -327,7 +329,7 @@ public class IncrementsPlugin extends BasePlugin implements IModelBuilderPluginH ...@@ -327,7 +329,7 @@ public class IncrementsPlugin extends BasePlugin implements IModelBuilderPluginH
sb.append("column.value"); sb.append("column.value");
when.addAttribute(new Attribute("test", sb.toString())); when.addAttribute(new Attribute("test", sb.toString()));
when.addElement(new TextElement("${column.value} = ${column.value} ${record.incrementsColumnsInfoMap." when.addElement(new TextElement("${column.value} = ${column.value} ${record." + FIELD_INC_MAP + "."
+ introspectedColumn.getActualColumnName() + introspectedColumn.getActualColumnName()
+ ".value} #{record.${column.javaProperty},jdbcType=${column.jdbcType}}")); + ".value} #{record.${column.javaProperty},jdbcType=${column.jdbcType}}"));
choose.addElement(when); choose.addElement(when);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment