|
|
@ -162,7 +162,7 @@ require(path.join(process.cwd(), "..", "server", "dist", "database.js")); |
|
|
|
|
|
|
|
|
|
|
|
let formQuestions = await bpmsDB.bpms_formQuestion.findAll({ |
|
|
|
let formQuestions = await bpmsDB.bpms_formQuestion.findAll({ |
|
|
|
where: { |
|
|
|
where: { |
|
|
|
processId:process.id, |
|
|
|
processId: process.id, |
|
|
|
}, |
|
|
|
}, |
|
|
|
raw: true |
|
|
|
raw: true |
|
|
|
}); |
|
|
|
}); |
|
|
@ -171,7 +171,9 @@ require(path.join(process.cwd(), "..", "server", "dist", "database.js")); |
|
|
|
|
|
|
|
|
|
|
|
let questions = await bpmsDB.bpms_question.findAll({ |
|
|
|
let questions = await bpmsDB.bpms_question.findAll({ |
|
|
|
where: { |
|
|
|
where: { |
|
|
|
id: [...formQuestions.map(e => +e.questionId), ...checkListQuestions.map(e => +e.questionId)] |
|
|
|
id: [...formQuestions.map(e => +e.questionId), |
|
|
|
|
|
|
|
// ...checkListQuestions.map(e => +e.questionId)
|
|
|
|
|
|
|
|
] |
|
|
|
}, |
|
|
|
}, |
|
|
|
raw: true, |
|
|
|
raw: true, |
|
|
|
}); |
|
|
|
}); |
|
|
|