|
|
@@ -63,14 +63,14 @@ module.exports = app => {
|
|
|
async lockConfirm4CheckNoPre(stage, uid, pre_uid, transaction) {
|
|
|
if (!transaction) throw '缺少参数';
|
|
|
|
|
|
- const locked = await this.getAllDataByCondition({ where: { sid: stage.sid, locked: 1, times: stage.curTimes } });
|
|
|
+ const locked = await this.getAllDataByCondition({ where: { sid: stage.id, locked: 1, times: stage.curTimes } });
|
|
|
// 审批人数据锁定
|
|
|
- const locking = await this.getAllDataByCondition({ where: { sid: stage.sid, times: stage.curTimes, uid: uid } });
|
|
|
+ const locking = await this.getAllDataByCondition({ where: { sid: stage.id, times: stage.curTimes, uid: uid } });
|
|
|
if (locking.length > 0) {
|
|
|
const updateLock = locking.map(x => { return { id: x.id, locked: 1 }; });
|
|
|
await transaction.updateRows(this.tableName, updateLock);
|
|
|
}
|
|
|
- const preConfirm = await this.getAllDataByCondition({ where: { sid: stage.sid, times: stage.curTimes, uid: pre_uid } });
|
|
|
+ const preConfirm = await this.getAllDataByCondition({ where: { sid: stage.id, times: stage.curTimes, uid: pre_uid } });
|
|
|
// 前审批人数据，与被锁定数据相关数据确认状态保留
|
|
|
locked.push(...locking);
|
|
|
if (preConfirm.length > 0) {
|
