diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java index 570b0ade..b01869fc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java @@ -532,7 +532,9 @@ public class QyWxOperationController { List approverQyWxUid = new ArrayList<>(); // 定义已完成审批的节点数 - int approval_count = 0; + int approval_complete_count = 0; + // 定义当前审批流程的节点总数 + int approval_count = spRecord_list.size(); // 获取审批申请状态变化类型:1-提单;2-同意;3-驳回;4-转审;5-催办;6-撤销;8-通过后撤销;10-添加备注 String spStatus = approvalInfo.getStatuChangeEvent(); @@ -564,7 +566,7 @@ public class QyWxOperationController { // 设置当前审批的状态 ad_SpStatus = ad.getSpStatus(); // 已审批节点数+1 - approval_count++; + approval_complete_count++; break; } } @@ -644,9 +646,10 @@ public class QyWxOperationController { } - if (!flagForLabel) { - // 如果第二个节点不是标签节点 - if (approval_count > 1) { + if (!flagForLabel && approval_count < 3) { + // 如果第二个节点不是标签节点且总节点数小于3个 + + if (approval_complete_count > 1) { // 如果完成审批的节点数大于1 flagForDepository = 3; @@ -659,7 +662,7 @@ public class QyWxOperationController { } else { // 如果第二个节点是标签节点 - if (approval_count > 2) { + if (approval_complete_count > 2) { // 如果完成审批的节点数大于2 flagForDepository = 3; // 如果已经完成该审批记录,则进行删除