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 5533ad1f..1f29fc31 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 f28a3723..913575b0 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 @@ -924,7 +924,7 @@ public class OutputWordUtil { //定义表格数据 - String[] header = {"关键控制点", "控制描述","对应风险控制","角色/岗位"}; + String[] header = {"关键控制点", "控制描述","对应风险描述","角色/岗位"}; //添加表格的表头 Table table = section.addTable(true); table.resetCells(tableInfo.size(),header.length); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java index 05012113..c86c3f65 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java @@ -5541,7 +5541,7 @@ public class PALRepositoryQueryAPIManager { public boolean hasAccessPortalDesignerPerm(UserContext uc, PALRepositoryModel model) { String newBoName = "BO_ACT_PUBLISH_PERM_SCOPE"; - BO bo = SDK.getBOAPI().query(newBoName).addQuery("PALVERSIONID=", model.getId()).detail(); + BO bo = SDK.getBOAPI().query(newBoName).addQuery("PALVERSIONID=", model.getVersionId()).detail(); if (bo == null) { return false; }