|
@@ -763,7 +763,7 @@ module.exports = app => {
|
|
|
' ON sc.stimes = MF.stimes And sc.sorder = MF.sorder And sc.cbid = MF.cbid' +
|
|
|
' GROUP BY sc.cbid' +
|
|
|
' ) As scb ON cb.id = scb.cbid' +
|
|
|
- ' WHERE c.tid = ? And c.status = ? And ' + filter +
|
|
|
+ ' WHERE c.tid = ? And c.status = ? And c.valid And ' + filter +
|
|
|
' ORDER BY c.in_time';
|
|
|
const sqlParam = [tid, tid, audit.flow.status.checked];
|
|
|
const changes = await this.db.query(sql, sqlParam);
|
|
@@ -820,10 +820,10 @@ module.exports = app => {
|
|
|
' LEFT JOIN ' + this.ctx.service.changeAuditList.tableName + ' As cb ON sc.cbid = cb.id' +
|
|
|
' GROUP By sc.`cbid`' +
|
|
|
' ) As U ON C.cid = U.cid' +
|
|
|
- ' WHERE C.tid = ?' +
|
|
|
+ ' WHERE C.tid = ? And C.status = ? And C.valid' +
|
|
|
' GROUP By C.cid' +
|
|
|
' ORDER By in_time';
|
|
|
- const sqlParam = [this.ctx.tender.info.decimal.tp, tid, tid];
|
|
|
+ const sqlParam = [this.ctx.tender.info.decimal.tp, tid, tid, audit.flow.status.checked];
|
|
|
return await this.db.query(sql, sqlParam);
|
|
|
}
|
|
|
|