BruceSun
/
SAMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复会签节点无法审批问题

rf
tony 2023-02-09 16:02:02 +08:00
parent e63dc6f458
commit 736db6506f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
View File

@ -1018,7 +1018,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics(); MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics();
// 会签节点 // 会签节点
if (Objects.nonNull(multiInstance)) { if (Objects.nonNull(multiInstance)) {
flowNextDto.setVars(multiInstance.getElementVariable()); flowNextDto.setVars(multiInstance.getInputDataItem());
flowNextDto.setType(ProcessConstants.PROCESS_MULTI_INSTANCE); flowNextDto.setType(ProcessConstants.PROCESS_MULTI_INSTANCE);
flowNextDto.setDataType(ProcessConstants.DYNAMIC); flowNextDto.setDataType(ProcessConstants.DYNAMIC);
} else { } else {
@ -1055,7 +1055,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics(); MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics();
// 会签节点 // 会签节点
if (Objects.nonNull(multiInstance)) { if (Objects.nonNull(multiInstance)) {
flowNextDto.setVars(multiInstance.getElementVariable()); flowNextDto.setVars(multiInstance.getInputDataItem());
flowNextDto.setType(ProcessConstants.PROCESS_MULTI_INSTANCE); flowNextDto.setType(ProcessConstants.PROCESS_MULTI_INSTANCE);
flowNextDto.setDataType(ProcessConstants.DYNAMIC); flowNextDto.setDataType(ProcessConstants.DYNAMIC);
} else { } else {

2
ruoyi-ui/src/views/flowable/task/myProcess/send/index.vue
View File

@ -235,7 +235,7 @@ export default {
if (selection instanceof Array) { if (selection instanceof Array) {
const selectVal = selection.map(item => item.userId); const selectVal = selection.map(item => item.userId);
if (this.multiInstanceVars) { if (this.multiInstanceVars) {
this.checkValues = selection; this.checkValues = selectVal;
} else { } else {
this.checkValues = selectVal.join(','); this.checkValues = selectVal.join(',');
} }

2
ruoyi-ui/src/views/flowable/task/todo/detail/index.vue
View File

@ -272,7 +272,7 @@ export default {
if (selection instanceof Array) { if (selection instanceof Array) {
const selectVal = selection.map(item => item.userId); const selectVal = selection.map(item => item.userId);
if (this.multiInstanceVars) { if (this.multiInstanceVars) {
this.$set(this.taskForm.variables, this.multiInstanceVars, selection); this.$set(this.taskForm.variables, this.multiInstanceVars, selectVal);
} else { } else {
this.$set(this.taskForm.variables, "approval", selectVal.join(',')); this.$set(this.taskForm.variables, "approval", selectVal.join(','));
} }