修复变更审批流排序获取有问题导致重复终审添加

app/middleware/change_audit_check.js

@@ -33,7 +33,7 @@ module.exports = options => {
             if ((change.status === status.uncheck || change.status === status.back || change.status === status.revise) && this.tender.info.shenpi.change !== shenpiConst.sp_status.sqspr) {
                 const shenpi_status = this.tender.info.shenpi.change;
                 // 进一步比较审批流是否与审批流程设置的相同，不同则替换为固定审批流或固定的终审
-                const auditList = yield this.service.changeAudit.getAllDataByCondition({ where: { cid: change.cid, times: change.times } });
+                const auditList = yield this.service.changeAudit.getAllDataByCondition({ where: { cid: change.cid, times: change.times }, orders: [['usort', 'asc']] });
                 auditList.shift();
                 const auditIdList = _.map(auditList, 'uid');
                 if (shenpi_status === shenpiConst.sp_status.gdspl) {

app/service/change_audit.js

@@ -156,7 +156,7 @@ module.exports = app => {
                 case 2:// 待重新上报
                 case 9:// 待修订
                     sql = 'SELECT * FROM ?? WHERE ' +
-                        'cid = ? AND times = ? GROUP BY usite';
+                        'cid = ? AND times = ? GROUP BY usite ORDER BY usort asc';
                     sqlParam = [this.tableName, change.cid,
                         change.times];
                     break;
@@ -173,7 +173,7 @@ module.exports = app => {
                 case 6: // 审批中
                     sql = 'SELECT * FROM (SELECT MAX(usort) as ust FROM ?? ' +
                         'WHERE cid = ? and times = ? GROUP BY usite ) as b ' +
-                        'JOIN ?? as a ON a.usort = b.ust WHERE cid = ? and times = ? ORDER BY usite';
+                        'JOIN ?? as a ON a.usort = b.ust WHERE cid = ? and times = ? ORDER BY usite asc';
                     sqlParam = [this.tableName, change.cid, change.times, this.tableName, change.cid, change.times];
                     // sql = 'SELECT * FROM ?? WHERE ' +
                     //     'cid = ? AND times = ? ORDER BY usort';