From 2024829f86cdfec5e95c5532df69231dbd112df3 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Mon, 5 Sep 2022 19:44:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=9A=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java index cfb11e6..d219eee 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java @@ -258,7 +258,6 @@ public class FlowInstance { //获取当前单据活动任务列表及当前任务 // act_inst = null; List list = provider.findCurTask(procInst.getId()); - listTask.addAll(list); //当前登录用户 String sqlIn = ""; for (Task act : list) { @@ -304,6 +303,8 @@ public class FlowInstance { actInst = provider.findTask(procInst.getTaskId()); } + listTask.addAll(list); + return listTask; } @@ -401,7 +402,7 @@ public class FlowInstance { private SwMap createButton(AbstractEnum.StrEnumBean type, boolean valid) { SwMap button = new SwMap(); - button.put("type", type); + button.put("type", type.value); button.put("label", type.name); button.put("valid", valid); return button; @@ -434,7 +435,7 @@ public class FlowInstance { buttons.add(createButton(FlowConst.Button.SUBMIT, canSubmit)); boolean canReject = !isFinish && !actInst.isMake() && actInst.getStatu() < FlowConst.ActivityStatu.SUBMIT.value && actInst.getHandler() == user_id; - buttons.add(createButton(FlowConst.Button.SUBMIT, canReject)); + buttons.add(createButton(FlowConst.Button.REJECT, canReject)); buttons.add(createButton(FlowConst.Button.INTERRUPT, canReject)); //我已提交的任务，取回(前面已经过滤掉不能取回的任务：下一任务已办理)