Commit 3202cbf5 by cjh

修改递归死循环bug

parent 80c8f851
...@@ -192,11 +192,19 @@ public abstract class AbstractCommonController { ...@@ -192,11 +192,19 @@ public abstract class AbstractCommonController {
log.error("错误的modifymap:"+noUiRequest.getMappingUrl()+"--"+modifyMap); log.error("错误的modifymap:"+noUiRequest.getMappingUrl()+"--"+modifyMap);
continue; continue;
} }
if (aliasPath.startsWith(modifyEntry.getKey())) { int modKeyLen = modifyEntry.getKey().length();
if(aliasPath.equals(modifyEntry.getKey()) || (aliasPath.startsWith(modifyEntry.getKey())) && aliasPath.charAt(modKeyLen) == '\\'){
Object val = modifyEntry.getValue(); Object val = modifyEntry.getValue();
if(aliasKey == null) if(aliasKey == null)
continue; continue;
data.put(aliasKey, NoUiPresentationUtil.handIBaseObject(context, val, aliasEntry.getValue()));
if(aliasPath.length() > modKeyLen && val instanceof IModule){
IBaseObject obj = context.getSession().getBaseObject((IModule)val,aliasPath.substring(modKeyLen));
if(!(obj instanceof IModule))
data.put(aliasKey,NoUiPresentationUtil.handIBaseObject(context,obj,aliasEntry.getValue()));
}
else
data.put(aliasKey, NoUiPresentationUtil.handIBaseObject(context, val, aliasEntry.getValue()));
containsKeys.add(modifyEntry.getKey()); containsKeys.add(modifyEntry.getKey());
} }
...@@ -212,7 +220,8 @@ public abstract class AbstractCommonController { ...@@ -212,7 +220,8 @@ public abstract class AbstractCommonController {
System.out.println("modify moduleList:" + (modifyMap.get(key) instanceof IModuleList)); System.out.println("modify moduleList:" + (modifyMap.get(key) instanceof IModuleList));
if(key == null) if(key == null)
continue; continue;
data.put(key, NoUiPresentationUtil.handIBaseObject(context, modifyMap.get(key), key)); if(!(modifyMap.get(key) instanceof IModule))
data.put(key, NoUiPresentationUtil.handIBaseObject(context, modifyMap.get(key), key));
} }
} }
......
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