Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r14604 -r14633 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 14604) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 14633) @@ -300,6 +300,10 @@ @Override public void saveTousseDefinition(TousseDefinition td, File upload,String materialInstanceStr,Long ancestorID) { + boolean save = true; + if(DatabaseUtil.isPoIdValid(td.getId())){ + save = false; + } if (td.getId() != null && 0 == td.getId()) { td.setId(null); } @@ -492,18 +496,19 @@ td.setAncestorID(ancestorID); } saveOrUpdate(td); - - //如果修改前的名称与修改后的名称不一致,则修改器械包定义的器械包名称为相应修改其它相关表的器械包名称 - if(td.getOrginalName() != null && !td.getOrginalName().equals(td.getName())){ - if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType()) - || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType()) - || TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType())){ - updateOtherEntityTousseName(td.getOrginalName() , td); + if(!save){ + //如果修改前的名称与修改后的名称不一致,则修改器械包定义的器械包名称为相应修改其它相关表的器械包名称 + if(td.getOrginalName() != null && !td.getOrginalName().equals(td.getName())){ + if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType()) + || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType()) + || TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType())){ + updateOtherEntityTousseName(td.getOrginalName() , td); + } + //器械包定义名称修改输出到日志 + appLogManager.saveLog(AcegiHelper.getLoginUser(), + Log.MODEL_TOUSSEDEFINITION, Log.TYPE_UPDATE, "id:" + td.getId() + + ",oldName:"+ td.getOrginalName() + ",newName:"+ td.getName()); } - //器械包定义名称修改输出到日志 - appLogManager.saveLog(AcegiHelper.getLoginUser(), - Log.MODEL_TOUSSEDEFINITION, Log.TYPE_UPDATE, "id:" + td.getId() + - ",oldName:"+ td.getOrginalName() + ",newName:"+ td.getName()); } }