diff --git a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar index d903fe97..dc092b05 100644 Binary files a/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar and b/com.actionsoft.apps.coe.pal.output.pr/lib/com.actionsoft.apps.coe.pal.output.pr.jar differ 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 2d49b5c2..a2ee1bce 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 @@ -706,15 +706,14 @@ public class Report1Gener { List lead_processRelationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "lead_process"); - JSONObject _process_tr = new JSONObject(); + if (lead_processRelationList.size() > 0) { + JSONObject lead_process_tr = new JSONObject(); StringBuilder sb =new StringBuilder(); for (DesignerShapeRelationModel relation : lead_processRelationList) { String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID List models = PALRepositoryCache.getByVersionId(relationFileId); - if (models != null && models.size() > 0) { - for (PALRepositoryModel oneModel : models) { if (oneModel.isUse() == true) { sb.append(oneModel.getName()).append(","); @@ -724,13 +723,17 @@ public class Report1Gener { } if(sb.length()>0){ sb.deleteCharAt(sb.length() -1); - _process_tr.put("name",sb.toString()); - _process_tr.put("type","上游流程"); + lead_process_tr.put("name",sb.toString()); + lead_process_tr.put("type","上游流程"); + } + if(!lead_process_tr.isEmpty()){ + procedureTable.add(lead_process_tr); } } List rear_processRelationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "rear_process"); if (rear_processRelationList.size() > 0) { + JSONObject rear_process_tr = new JSONObject(); StringBuilder sb =new StringBuilder(); for (DesignerShapeRelationModel relation : rear_processRelationList) { String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID @@ -745,13 +748,14 @@ public class Report1Gener { } if(sb.length()>0){ sb.deleteCharAt(sb.length() -1); - _process_tr.put("name",sb.toString()); - _process_tr.put("type","下游流程"); + rear_process_tr.put("name",sb.toString()); + rear_process_tr.put("type","下游流程"); + } + if(!rear_process_tr.isEmpty()){ + procedureTable.add(rear_process_tr); } } - if(!_process_tr.isEmpty()){ - procedureTable.add(_process_tr); - } + //相关/支持文件