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 36872088..cb665a6d 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 0b3ffa16..250c80f6 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 @@ -3884,7 +3884,7 @@ public class CoeDesignerWeb extends ActionWeb { if (SDK.getAppAPI().getPropertyBooleanValue(CoEConstant.APP_ID, "IS_RECORD_OP_LOG", false)) { CoEOpLogAPI.auditOkOp(_uc, CoEOpLogConst.MODULE_CATEGORY_REPOSITORY, CoEOpLogConst.OP_DELETE, CoEOpLogConst.INFO_REPOSITORY_VERSION_DELETE); } - deletePalCorrelationModel(wsId,teamId,id); + //deletePalCorrelationModel(wsId,teamId,id); } else { ro = ResponseObject.newErrResponse(); ro.msg("删除失败"); @@ -3951,7 +3951,7 @@ public class CoeDesignerWeb extends ActionWeb { ro.put("id", id); //将关联模型(角色、绩效)同步更改使用中状态 - changePalDesignerVersionUseBycorrelationModel(wsId,teamId,id); + //changePalDesignerVersionUseBycorrelationModel(wsId,teamId,id); return ro.toString(); } else { 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 69735909..86170b8d 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 @@ -716,7 +716,7 @@ public class CoeProcessLevelUtil { //bybzp 如果图形是过程链图和BPMN图 则不复制流程绩效和角色 PALRepositoryModel model = PALRepositoryCache.getCache().get(uuId); String methodId = model.getMethodId(); - if("process.bpmn2".contains(methodId) /*&& "Process_performance_metrics,role".contains(oldModel.getAttrId())*/){ + if("process.bpmn2,process.epc".contains(methodId) && "Process_performance_metrics,role".contains(oldModel.getAttrId())){ continue; } //by bzp end 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 89b990af..bd043c5a 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 @@ -10329,19 +10329,35 @@ public String deleteReply(String replyid, String messageid) { if(propertyModel.getPropertyId().equals("Process_performance_metrics")){ String relationFileId=JSONObject.parseObject(propertyModel.getPropertyValue()).getString("relationFileId"); String[] splitRelationFileId; - if(relationFileId!=null){ - splitRelationFileId=relationFileId.split(","); + PALRepositoryModel model; + if(UtilString.isNotEmpty(relationFileId)){ + if(relationFileId.contains(",")){ + splitRelationFileId=relationFileId.split(","); + model= PALRepositoryCache.getCache().get(splitRelationFileId[0]); - PALRepositoryModel model = PALRepositoryCache.getCache().get(splitRelationFileId[0]); + String result = copyFile(wsId, teamId, splitRelationFileId[0], "control", "all"); - String result = copyFile(wsId, teamId, splitRelationFileId[0], "control", "all"); + JSONObject moveRo = JSONObject.parseObject(result); + if (!"ok".equals(moveRo.getString("result"))) { + SDK.getLogAPI().consoleErr("复制文件[" + model.getName() + "][" + model.getId() + "]失败," + moveRo.getString("msg")); + return ResponseObject.newErrResponse(moveRo.getString("msg")).toString(); + } + + }else{ + model= PALRepositoryCache.getCache().get(relationFileId); + + String result = copyFile(wsId, teamId, relationFileId, "control", "all"); + + JSONObject moveRo = JSONObject.parseObject(result); + if (!"ok".equals(moveRo.getString("result"))) { + SDK.getLogAPI().consoleErr("复制文件[" + model.getName() + "][" + model.getId() + "]失败," + moveRo.getString("msg")); + return ResponseObject.newErrResponse(moveRo.getString("msg")).toString(); + } - JSONObject moveRo = JSONObject.parseObject(result); - if (!"ok".equals(moveRo.getString("result"))) { - SDK.getLogAPI().consoleErr("复制文件[" + model.getName() + "][" + model.getId() + "]失败," + moveRo.getString("msg")); - return ResponseObject.newErrResponse(moveRo.getString("msg")).toString(); } + + } } diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js index 0ace0a1c..300f7390 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js @@ -3578,7 +3578,6 @@ function openRelationDig(obj,value) { uuid:ruuid, methodId:methodId }, - async: false, success : function(msg) { if (msg.data.result == "ok") { window.top.$.simpleAlert("请勿重复新建角色模型!!!"); @@ -3596,7 +3595,9 @@ function openRelationDig(obj,value) { wsId:wsId, teamId : parent.$('#teamId').val() }, + async:false, success : function(msg) { + debugger; if (msg.result == "ok") { //关闭新建按钮 $(".dlg-button button").eq(2).hide();