diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index a2ee1bce..cad8ef11 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -395,9 +395,21 @@ public class Report1Gener { int regulateIndex = 1;// 控制序号 // 输出结果 for (Map shape : repositoryFileElements) { - if ("method_approval_node,method_service_node,method_approval_node3,method_service_node4,decision,sub_process_node".indexOf((String)shape.get("type")) == -1) { + //优化此处代码逻辑,备注process和子流程sub_process_node冲突了 + String type = shape.get("type").toString(); + Set typeList = new HashSet<>(); + typeList.add("method_approval_node"); + typeList.add("method_service_node"); + typeList.add("method_approval_node3"); + typeList.add("method_service_node4"); + typeList.add("decision"); + typeList.add("sub_process_node"); + if(!typeList.contains(type)){ continue; } + /*if ("method_approval_node,method_service_node,method_approval_node3,method_service_node4,decision,sub_process_node".indexOf((String)shape.get("type")) == -1) { + continue; + }*/ JSONObject _tr = new JSONObject(); JSONObject _roleMappingPostTr = new JSONObject(); JSONObject _criticalControlPointTr = new JSONObject();