diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlToWord.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlToWord.java index e3fb0647..22cf87eb 100644 --- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlToWord.java +++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/util/htmltodocx/HtmlToWord.java @@ -72,16 +72,16 @@ public class HtmlToWord { documentPart.addStyledParagraphOfText("Subtitle", em.text()); break; case "imgurl": - /*String imgSrc = em.attr("src"); + String imgSrc = em.attr("src"); File file = new File(imgSrc); byte[] bytes = convertImageToByteArray(file); - addImageToPackage(wordMLPackage, bytes);*/ + addImageToPackage(wordMLPackage, bytes); break; case "imgbase64": break; case "table": - /*Tbl table = addTable(em); - documentPart.addObject(table);*/ + Tbl table = addTable(em); + documentPart.addObject(table); break; case "h1": P tmp = documentPart.addStyledParagraphOfText("Heading1", em.text()); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java index 84456ae4..f4475e8c 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java @@ -2256,7 +2256,6 @@ public class CoeProcessLevelUtil { attribute.put("name", property.getPropertyName()); attribute.put("key", property.getPropertyId()); - //如果是关联属性,增加链接功能 if(attributeModel.getType().equals("relation")){ @@ -2264,9 +2263,8 @@ public class CoeProcessLevelUtil { String relationFileId = JSONObject.parseObject(property.getPropertyValue()).get("relationFileId").toString(); - String url=SDK.getPortalAPI().getPortalUrl()+"/r/w?uuid="+relationFileId+"&teamId=&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid="+sessionId+""; - String appUrl=""+inputValue+""; + String appUrl=""+inputValue+""; attribute.put("value", appUrl); }else{ attribute.put("value", inputValue);