Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r14063 -r14097 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 14063) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 14097) @@ -148,6 +148,12 @@ tousseDefinition.generateMaterialsMD5(); } objectDao.saveOrUpdate(tousseDefinition); + //更新包定义的祖先id + if(tousseDefinition.getAncestorID() == null){ + tousseDefinition.setAncestorID(tousseDefinition.getId()); + objectDao.saveOrUpdate(tousseDefinition); + } + } @Override @@ -468,6 +474,10 @@ } } // } + + if(ancestorID != null){ + td.setAncestorID(ancestorID); + } saveOrUpdate(td); //如果修改前的名称与修改后的名称不一致,则修改器械包定义的器械包名称为相应修改其它相关表的器械包名称 @@ -481,12 +491,6 @@ Log.MODEL_TOUSSEDEFINITION, Log.TYPE_UPDATE, "id:" + td.getId() + ",oldName:"+ td.getOrginalName() + ",newName:"+ td.getName()); } - - if(ancestorID == null){ - td.setAncestorID(td.getId()); - }else{ - td.setAncestorID(ancestorID); - } } /**