yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复升版问题

Browse Source
This commit is contained in:
zhal 2022-08-17 13:55:39 +08:00
parent 4a522847ed
commit d49c745a93
5 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java
View File

@ -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 {

2
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/CoeProcessLevelUtil.java
View File

@ -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

32
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -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();
}
}
}

3
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js
View File

@ -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();