|
@@ -445,7 +445,7 @@ module.exports = app => {
|
|
|
const pre = await this.db.query(preSql, [stage.tid, stage.order]);
|
|
|
const sql = 'SELECT * FROM ' + this.ctx.service.stageChange.tableName + ' WHERE sid = ? AND (stimes * 100 + sorder) <= (? * 100 + ?)';
|
|
|
const curAll = await this.db.query(sql, [stage.id, stage.curTimes, stage.curOrder]);
|
|
|
- const cur = this.ctx.helper.filterLastestData(curAll, ['lid', 'pid', 'cid', 'cbid']);
|
|
|
+ const cur = this.ctx.helper.filterLastestData(curAll, ['lid', 'pid', 'cid', 'cbid'], 'stimes', 'sorder');
|
|
|
return [...pre, ...cur];
|
|
|
}
|
|
|
}
|