撤回相关

app/service/stage.js

@@ -274,13 +274,16 @@ module.exports = app => {
                         return; // 不可以多次撤回
                     }
 
+                    const preAuditHasCheckNoPre = preAuditors.find(pa => { return pa.status === status.checkNoPre; });
                     const preAuditChecked = preAuditors.find(pa => { return pa.status === status.checked && pa.aid === accountId; });
                     const preAuditCheckNoPre = preAuditors.find(pa => { return pa.status === status.checkNoPre && pa.aid === accountId; });
                     if (preAuditorIds.indexOf(accountId) >= 0) {
-                        if (preAuditChecked) {
+                        if (preAuditHasCheckNoPre) {
+                            if (preAuditCheckNoPre) {
+                                stage.cancancel = 3;// 审批人撤回审批退回上一人
+                            }
+                        } else if (preAuditChecked) {
                             stage.cancancel = 2;// 审批人撤回审批通过
-                        } else if (preAuditCheckNoPre) {
-                            stage.cancancel = 3;// 审批人撤回审批退回上一人
                         }
                         stage.preAuditors = preAuditors;
                     } else if (preAuditors.length === 0 && accountId === stage.user_id) {