diff --git a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar index 7f973c5b..70606f64 100644 Binary files a/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar and b/com.actionsoft.apps.coe.pal.datamigration/lib/com.actionsoft.apps.coe.pal.datamigration.jar differ diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlHandleWeb.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlHandleWeb.java index 49cbc5f5..03931439 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlHandleWeb.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlHandleWeb.java @@ -84,7 +84,7 @@ public class ArisXmlHandleWeb { path.add(groupMap.get(modelParent).getName()); getPath(path, groupMap.get(modelParent).getPid()); } - modelModel.setModelPath(StringUtils.join(path, "\\")); + modelModel.setModelPath(StringUtils.join(path, "\\").replace(" ", "")); } } diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java index 337841c3..945073f2 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/aris/web/ArisXmlImportRun.java @@ -417,7 +417,7 @@ public class ArisXmlImportRun { propertyModels = propertyModels.stream().filter(item -> Constant.METHOD_ARIS_URL.equals(item.getPropertyId())).collect(Collectors.toList()); Map map = new HashMap<>(); for (PALRepositoryPropertyModel prop : propertyModels) { - map.put(prop.getPlId(), prop.getPropertyValue()); + map.put(prop.getPlId(), prop.getPropertyValue().replace(" ", ""));// 去除空格 } for (PALRepositoryModel model : list) { if (map.containsKey(model.getId())) { @@ -1361,7 +1361,7 @@ public class ArisXmlImportRun { Timestamp nowTime = new Timestamp(System.currentTimeMillis()); PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id, UUIDGener.getUUID(), wsId, arisModel.getName(), "", orderIndex, parentId, "org", true, 1, - id, false, "org.role", "0", 1, null, null, uc.getUID(), uc.getUID(), nowTime, null, null, null, null, + id, false, "org.role", "0", 1, null, null, uc.getUID(), uc.getUID(), nowTime, null, palModel.getId(), null, null, null, null, null, null, null, -1); coeProcessLevel.insert(model); LogUtil.appendLog(Constant.LOG_END + "创建与ARIS流程同名的角色图[" + arisModel.getName() + "][" + model.getId() + "]", simpleLogFile, fullLogFile);