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 f9abf1e3..c3839483 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 eae86ffa..1de6cdec 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 @@ -4684,8 +4684,9 @@ public class CoeDesignerWeb extends ActionWeb { ResponseObject ro = ResponseObject.newOkResponse(); DesignerShapeRelationDao dao = new DesignerShapeRelationDao(); List oldModelList = dao.getModelListByFileId(id); - for (DesignerShapeRelationModel oldModel : oldModelList) { + if(oldModelList.size()>0){ + DesignerShapeRelationModel oldModel=oldModelList.get(0); //如果关联角色图,则同步复制角色图关联关系 String methodIds = ""; if (oldModel.getAttrId().equals("role")) { @@ -4705,6 +4706,7 @@ public class CoeDesignerWeb extends ActionWeb { } } + return ro.toString(); } 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 03d8f707..10e348a5 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,9 +716,10 @@ public class CoeProcessLevelUtil { //bybzp 如果图形是过程链图和BPMN图 则不复制流程绩效和角色 PALRepositoryModel model = PALRepositoryCache.getCache().get(uuId); String methodId = model.getMethodId(); - if("process.bpmn2,process.epc".contains(methodId) && "Process_performance_metrics,role".contains(oldModel.getAttrId())){ + if(("process.bpmn2,process.epc,process.flowchart".contains(methodId)) && "Process_performance_metrics,role".contains(oldModel.getAttrId())){ continue; } + //by bzp end if (mapNewUUID.containsKey(oldModel.getShapeId())) { DesignerShapeRelationModel newModel = new DesignerShapeRelationModel();