Commit e10e2d8e authored by yanzg's avatar yanzg

常规BUG的修改

parent 75e74d54
...@@ -113,27 +113,28 @@ public class TableStruct { ...@@ -113,27 +113,28 @@ public class TableStruct {
boolean isTypeMany = resultActionType != DaoConst.FIELD_MD5 boolean isTypeMany = resultActionType != DaoConst.FIELD_MD5
&& resultActionType != DaoConst.FIELD_REMOVE && resultActionType != DaoConst.FIELD_REMOVE
&& resultActionType != DaoConst.FIELD_VERSION; && resultActionType != DaoConst.FIELD_VERSION
if (isTypeMany) { && resultActionType != DaoConst.FIELD_COMMON;
if (resultActionType != DaoConst.FIELD_COMMON) {
List<TableFieldVo> actionList = this.getFieldActionList(resultActionType); List<TableFieldVo> actionList = this.getFieldActionList(resultActionType);
// 处理其他特殊列
if (isTypeMany) {
actionList.add(vo); actionList.add(vo);
} }
// 处理其他特殊列 else if (resultActionType == fieldAction) {
else if (resultActionType != DaoConst.FIELD_COMMON) {
List<TableFieldVo> actionList = this.getFieldActionList(resultActionType);
// fieldAction 优先级高于 stringAction // fieldAction 优先级高于 stringAction
// 假如特殊列已经存在,则将已经存在的特殊列删除,并且添加新的特殊列 // 假如特殊列已经存在,则将已经存在的特殊列删除,并且添加新的特殊列
if (resultActionType == fieldAction) {
actionList.clear(); actionList.clear();
actionList.add(vo); actionList.add(vo);
} else { } else if (actionList.isEmpty()) {
// stringAction
// 假如是默认的,并且特殊列已经存在,则不进行任何处理 // 假如是默认的,并且特殊列已经存在,则不进行任何处理
if (actionList.isEmpty()) {
actionList.add(vo); actionList.add(vo);
} }
} }
} }
}
} }
/** /**
......
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