|
@@ -42,20 +42,10 @@ public class FlowTaskListener implements TaskListener {
|
|
|
|
|
|
FlwTask flwTask = supplier.get();
|
|
FlwTask flwTask = supplier.get();
|
|
|
|
|
|
-
|
|
|
|
- if (TaskEventType.complete.eq(eventType)) {
|
|
|
|
- if (null != flwTask && TaskType.rejectJump.eq(flwTask.getTaskType())) {
|
|
|
|
-
|
|
|
|
- NodeModel parentNodeModel = this.getNodeModel(flwTask, nodeModel).getNode(flwTask.getTaskKey());
|
|
|
|
- if (null == parentNodeModel.getParentNode()) {
|
|
|
|
-
|
|
|
|
- return true;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
|
|
- if (TaskEventType.create.eq(eventType) || TaskEventType.recreate.eq(eventType)) {
|
|
+ if (TaskEventType.create.eq(eventType) || TaskEventType.recreate.eq(eventType)
|
|
|
|
+
|
|
|
|
+ || TaskEventType.reApproveCreate.eq(eventType)) {
|
|
|
|
|
|
if (null != flwTask) {
|
|
if (null != flwTask) {
|
|
NodeModel currentNodeModel = this.getNodeModel(flwTask, nodeModel);
|
|
NodeModel currentNodeModel = this.getNodeModel(flwTask, nodeModel);
|