修复审批流bug

app/service/payment_detail.js

@@ -243,6 +243,9 @@ module.exports = app => {
             if (details && details.length > 0) {
                 const detailInfo = details[0];
                 if (detailInfo.status === auditConst.status.uncheck || detailInfo.status === auditConst.status.checkNo) {
+                    // 判断该人是否在审批流程里，是则移除并调整order
+                    const result2 = await this.ctx.service.paymentDetailAudit.updateAuditByReport(transaction, detailInfo.id, detailInfo.times, uid);
+                    // 更新为上报人
                     return await transaction.update(this.tableName, { id: detailInfo.id, uid });
                 }
             }

app/service/payment_detail_audit.js

@@ -627,6 +627,15 @@ module.exports = app => {
             ];
             return await this.db.query(sql, sqlParam);
         }
+
+        async updateAuditByReport(transaction, td_id, times, uid) {
+            const auditor = await this.getDataByCondition({ td_id, times, aid: uid });
+            if (auditor) {
+                // 更新order
+                await this._syncOrderByDelete(transaction, td_id, auditor.order, times);
+                return await transaction.delete(this.tableName, { id: auditor.id });
+            }
+        }
     }
 
     return PaymentDetailAudit;