diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 322131db..0f38b749 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java index 7a695c10..fb5d015a 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java @@ -1144,13 +1144,13 @@ public class OutputWordUtil { for(PALRepositoryModel oneModel:models){ if(oneModel.isUse()==true){ name=oneModel.getName(); + JSONObject tmp = new JSONObject(); + tmp.put("name", name); + tmp.put("desc", index); + related_support_files.add(tmp); } } } - JSONObject tmp = new JSONObject(); - tmp.put("name", name); - tmp.put("desc", index); - related_support_files.add(tmp); } @@ -1364,7 +1364,7 @@ public class OutputWordUtil { } try { - System.out.println("生成附件路径是=================="+outFile.getPath()); + System.out.println("Filed=================="+repositoryModel.getId()); doc.saveToFile(outFile.getPath(), FileFormat.Docx_2013); } catch (Exception e) { e.printStackTrace(); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java index 16f3dc2f..b7ae57aa 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java @@ -127,11 +127,14 @@ public class RepositoryTreeUtil { for(int i=0;i relatedRowMap=DBSql.getMaps("SELECT RELATIONFILEID FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID='"+palModel.getId()+"' and ATTRID='related_support_files'"); Map map=new HashMap(); if(relatedRowMap.size()>0){ for(int i=0;i