修复调差管理员修改流程bug

app/service/material.js

@@ -38,7 +38,8 @@ module.exports = app => {
             material.flowAuditorIds = this._.map(material.flowAuditors, 'aid');
             material.nextAuditors = material.curAuditors.length > 0 ? material.auditors.filter(x => { return x.order === material.curAuditors[0].order + 1; }) : [];
             material.nextAuditorIds = this._.map(material.nextAuditors, 'aid');
-            material.auditorGroups = this.ctx.helper.groupAuditors(material.auditors);
+            const newAuditors = material.auditors.filter(x => { return x.is_old === 0; });
+            material.auditorGroups = this.ctx.helper.groupAuditors(newAuditors);
             material.userGroups = this.ctx.helper.groupAuditorsUniq(material.auditorGroups);
             material.userGroups.unshift([{
                 aid: material.user.id, order: 0, times: material.times, audit_order: 0, audit_type: auditType.key.common,
@@ -55,7 +56,8 @@ module.exports = app => {
             // 获取审批流程中左边列表
             if (material.status === auditConst.status.checkNo && material.user_id !== this.ctx.session.sessionUser.accountId) {
                 const auditors = await this.ctx.service.materialAudit.getAuditors(material.id, times); // 全部参与的审批人
-                const auditorGroups = this.ctx.helper.groupAuditors(auditors);
+                const newAuditors = auditors.filter(x => { return x.is_old === 0; });
+                const auditorGroups = this.ctx.helper.groupAuditors(newAuditors);
                 material.auditors2 = this.ctx.helper.groupAuditorsUniq(auditorGroups);
                 material.auditors2.unshift([{
                     aid: material.user.id, order: 0, times: material.times - 1, audit_order: 0, audit_type: auditType.key.common,

app/service/material_audit.js

@@ -55,7 +55,7 @@ module.exports = app => {
          * @return {Promise<*>}
          */
         async getAuditors(materialId, times = 1, order_sort = 'asc') {
-            const sql = 'SELECT la.id, la.aid, la.times, la.order, la.status, la.opinion, la.begin_time, la.end_time, la.audit_type, la.audit_order,' +
+            const sql = 'SELECT la.id, la.aid, la.times, la.order, la.status, la.opinion, la.is_old, la.begin_time, la.end_time, la.audit_type, la.audit_order,' +
                 '    pa.name, pa.company, pa.role, pa.mobile, pa.telephone, pa.sign_path' +
                 `  FROM ${this.tableName} la LEFT JOIN ${this.ctx.service.projectAccount.tableName} pa ON la.aid = pa.id` +
                 '  WHERE la.mid = ? AND la.times = ?' +