Browse Source

fix: 退回直接删除节点审批中的任务

JieZ 2 years ago
parent
commit
2daa25a731

+ 1 - 2
bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillLogicImpl.java

@@ -1412,8 +1412,7 @@ public class BillLogicImpl implements BillLogic {
1412
         //退回需要删除当前节点审批中的数据
1412
         //退回需要删除当前节点审批中的数据
1413
         billTaskService.remove(Wrappers.lambdaQuery(BillTaskEntity.class)
1413
         billTaskService.remove(Wrappers.lambdaQuery(BillTaskEntity.class)
1414
                 .eq(BillTaskEntity::getBillId, billId)
1414
                 .eq(BillTaskEntity::getBillId, billId)
1415
-                .eq(BillTaskEntity::getTaskNodeKey, task.getTaskNodeKey())
1415
+                .eq(BillTaskEntity::getNodeStatus, BillTaskStatus.APPROVAL.getStatus()));
1416
-                .ne(BillTaskEntity::getId, task.getId()));
1417
         if (!extendEntity.getLinkType().equals(NodeLinkType.create.name())) {
1416
         if (!extendEntity.getLinkType().equals(NodeLinkType.create.name())) {
1418
             billBpmnLogic.returnToTargetTask(task, targetTask, userCode, opinion,
1417
             billBpmnLogic.returnToTargetTask(task, targetTask, userCode, opinion,
1419
                     actionParam.getNextApprover());
1418
                     actionParam.getNextApprover());