|
|
@@ -81,16 +81,22 @@ public class WithDrawHandle { |
|
|
|
.filter(c -> !NodeTypeEnum.CC.name().equals(c.getNodeType().name())) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
|
|
|
|
if (CollUtil.isEmpty(currentProgressInfo)){ |
|
|
|
return Boolean.FALSE; |
|
|
|
} |
|
|
|
|
|
|
|
//1.判断出 当前审批人和上一个审批人 如果传了taskid |
|
|
|
ProgressNode progressNode = StringUtils.isBlank(param.getTaskId()) ? |
|
|
|
currentProgressInfo.get(currentProgressInfo.size() - 1) |
|
|
|
: findSubNodeByTaskId(param.getTaskId(),currentProgressInfo); |
|
|
|
ProgressNode beforeProgressNode = null; |
|
|
|
ProgressNode currentProgressNode = null; |
|
|
|
|
|
|
|
if (CollUtil.isEmpty(currentProgressInfo)){ |
|
|
|
if (Objects.isNull(progressNode)){ |
|
|
|
return Boolean.FALSE; |
|
|
|
} |
|
|
|
|
|
|
|
ProgressNode beforeProgressNode = null; |
|
|
|
ProgressNode currentProgressNode = null; |
|
|
|
|
|
|
|
// 说明当前节点是子流程节点 |
|
|
|
// 如果是会签 或签 当前和上个 |
|
|
|
List<ProgressNode> thisAndOr = Lists.newArrayList(); |
|
|
|