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 b8144044..36344bcc 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/OutPutReportWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java index 4e4540e5..d9139299 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/OutPutReportWeb.java @@ -435,6 +435,18 @@ public class OutPutReportWeb extends ActionWeb { return jsonArr.toString(); } + public String PALFileJsonDataRootTreeDataByDepartment(String methodType, String wsid, String versionType, String teamId,String departId) { + JSONArray jsonArr = null; + //if (teamId == null || "".equals(teamId)) { + if (teamId == null) { + jsonArr = PALRepositoryQueryAPIManager.getInstance().getPalRepositoryTreeDataByDeptId(_uc, wsid, methodType, versionType,departId); + } else { + jsonArr = PALRepositoryQueryAPIManager.getInstance().getPermPalRepositoryTreeDataByMethodsByDeptId(_uc, wsid, teamId, versionType, methodType,departId); + } + return jsonArr.toString(); + } + + /** * 报告数据保存 * 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 80878ce2..8b55d827 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 @@ -244,7 +244,6 @@ public class OutputWordUtil { // 设置模本装置方法和路径 try { UtilFile temps = new UtilFile(tempPath); - System.out.println(">>>>>>>tempPath = " + tempPath); configuration.setDirectoryForTemplateLoading(temps); } catch (IOException e2) { e2.printStackTrace();