|
@@ -434,14 +434,14 @@ module.exports = app => {
|
|
case auditConst.status.checkNoPre :
|
|
case auditConst.status.checkNoPre :
|
|
sql = 'SELECT la.`aid`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`sid`, la.`aid`, la.`order` ' +
|
|
sql = 'SELECT la.`aid`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`sid`, la.`aid`, la.`order` ' +
|
|
'FROM ?? AS la, ?? AS pa ' +
|
|
'FROM ?? AS la, ?? AS pa ' +
|
|
- 'WHERE la.`sid` = ? and la.`status` = ? and la.`aid` = pa.`id` order by la.`times` desc';
|
|
|
|
|
|
+ 'WHERE la.`sid` = ? and la.`status` = ? and la.`aid` = pa.`id` order by la.`times` desc, la.`id` desc';
|
|
sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, stageId, status];
|
|
sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, stageId, status];
|
|
auditor = await this.db.queryOne(sql, sqlParam);
|
|
auditor = await this.db.queryOne(sql, sqlParam);
|
|
break;
|
|
break;
|
|
case auditConst.status.checkNo :
|
|
case auditConst.status.checkNo :
|
|
sql = 'SELECT la.`aid`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`sid`, la.`aid`, la.`order` ' +
|
|
sql = 'SELECT la.`aid`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`sid`, la.`aid`, la.`order` ' +
|
|
'FROM ?? AS la, ?? AS pa ' +
|
|
'FROM ?? AS la, ?? AS pa ' +
|
|
- 'WHERE la.`sid` = ? and la.`status` = ? and la.`times` = ? and la.`aid` = pa.`id` order by la.`times` desc';
|
|
|
|
|
|
+ 'WHERE la.`sid` = ? and la.`status` = ? and la.`times` = ? and la.`aid` = pa.`id` order by la.`times` desc, la.`id` desc';
|
|
sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, stageId, auditConst.status.checkNo, parseInt(times) - 1];
|
|
sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, stageId, auditConst.status.checkNo, parseInt(times) - 1];
|
|
auditor = await this.db.queryOne(sql, sqlParam);
|
|
auditor = await this.db.queryOne(sql, sqlParam);
|
|
break;
|
|
break;
|