|
|
@@ -283,7 +283,7 @@ public class ModelVersionServiceImpl implements IModelVersionService
|
|
|
String bAddAfter = "FIRST";
|
|
|
for(ModelField bmf:baseFields) {
|
|
|
bmf.setAddAfter(bAddAfter);
|
|
|
- if(bmf.getFieldCode().equalsIgnoreCase(mf.getFieldCode())) {
|
|
|
+ if(bmf.getFieldCode().equals(mf.getFieldCode())) {
|
|
|
if((!StringUtils.equalsIgnoreCase(bmf.getFieldName(),mf.getFieldName()) ||
|
|
|
!StringUtils.equalsIgnoreCase(bmf.getNotNull(),mf.getNotNull()) ||
|
|
|
!StringUtils.equalsIgnoreCase(bmf.getAutoIncrement(),mf.getAutoIncrement()) ||
|
|
|
@@ -318,7 +318,7 @@ public class ModelVersionServiceImpl implements IModelVersionService
|
|
|
|
|
|
boolean fexist = false;
|
|
|
for (ModelField mf : fields) {
|
|
|
- if (bmf.getFieldCode().equalsIgnoreCase(mf.getFieldCode())) {
|
|
|
+ if (bmf.getFieldCode().equals(mf.getFieldCode())) {
|
|
|
fexist = true;
|
|
|
break;
|
|
|
}
|
|
|
@@ -543,7 +543,7 @@ public class ModelVersionServiceImpl implements IModelVersionService
|
|
|
VelocityContext velocityContext = new VelocityContext();
|
|
|
velocityContext.put("modelField", modelField);
|
|
|
// 获取模板
|
|
|
- String template = "vm/sql/" + dbType + "/deleteTField.vm";
|
|
|
+ String template = "vm/sql/" + dbType + "/deleteField.vm";
|
|
|
// 渲染模板
|
|
|
StringWriter sw = new StringWriter();
|
|
|
Template tpl = Velocity.getTemplate(template, Constants.UTF8);
|