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 33e4c691..c0ca84fe 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/repository/designer/web/CoeDesignerWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java index f106d7ff..8fabbfce 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java @@ -2875,7 +2875,7 @@ public class CoeDesignerWeb extends ActionWeb { return AlertWindow.getNotFoundMessagePage("未找到文件", "该文件已被删除"); } - macroLibraries.put("taskId", ""); + macroLibraries.put("taskId", taskId); // 增加三员管理模式taskid为new,change判断 if ("process".equals(plModel.getMethodCategory()) && !UtilString.isEmpty(taskId) && !"submit_create".equals(taskId) && !"new".equals(taskId) && !"change".equals(taskId)) { macroLibraries.put("outputFileName", plModel.getName() + ".doc"); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index b019561e..7b0dbec1 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -10510,7 +10510,7 @@ public String deleteReply(String replyid, String messageid) { List oldModelList = dao.getModelListByFileId(sourceId); for (DesignerShapeRelationModel oldModel : oldModelList) { - //如果关联角色图,则同步复制角色图关联关系 + //如果关联角色图,则同步复制角色图关联关系,由于角色图规定为本流程使用,所以获取一次 String methodIds = ""; if (oldModel.getAttrId().equals("role")) { PALRepository coeProcessLevel = CoeProcessLevelDaoFacotory.createCoeProcessLevel(); @@ -10523,8 +10523,10 @@ public String deleteReply(String replyid, String messageid) { SDK.getLogAPI().consoleErr("复制文件[" + model.getName() + "][" + model.getId() + "]失败," + moveRo.getString("msg")); return ResponseObject.newErrResponse(moveRo.getString("msg")).toString(); } + break; } + } } @@ -10586,6 +10588,7 @@ public String deleteReply(String replyid, String messageid) { } + break; } }