|
|
@@ -375,7 +375,7 @@ public class FlowInstance { |
|
|
|
boolean hasMake = false; |
|
|
|
for (Task act : listTask) { |
|
|
|
SwMap row = new SwMap(); |
|
|
|
tasks.add(row); |
|
|
|
bTasks.add(row); |
|
|
|
row.put("id", act.getId()); |
|
|
|
row.put("label", procDef.getProcInfo().getActNameById(act.getActId())); |
|
|
|
if (act.isMake()) { |
|
|
@@ -387,14 +387,15 @@ public class FlowInstance { |
|
|
|
} |
|
|
|
if (!hasMake && procDef.getProcInfo().isRejectToMake()) { |
|
|
|
SwMap row = new SwMap(); |
|
|
|
tasks.add(0, row); |
|
|
|
bTasks.add(0, row); |
|
|
|
Task act = provider.findMakeTask(procInst.getId()); |
|
|
|
row.put("id", act.getId()); |
|
|
|
row.put("label", procDef.getProcInfo().getActNameById(act.getActId())); |
|
|
|
row.put("type", 0); |
|
|
|
} |
|
|
|
extra.put("preTasks", bTasks); |
|
|
|
} |
|
|
|
extra.put("preTasks", tasks); |
|
|
|
|
|
|
|
List<SwMap> buttons = new ArrayList<>(); |
|
|
|
resetButtons(buttons); |
|
|
|
extra.put("buttons", buttons); |
|
|
|