diff --git a/README.md b/README.md index 6ab29b5..acdfce8 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ GitHub:https://github.com/tony2y/RuoYi-flowable.git + diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java index 9738125..003ae89 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java @@ -707,6 +707,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask List linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getTaskId()); StringBuilder stringBuilder = new StringBuilder(); for (HistoricIdentityLink identityLink : linksForTask) { + // 获选人,候选组/角色(多个) if ("candidate".equals(identityLink.getType())) { if (StringUtils.isNotBlank(identityLink.getUserId())) { SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId())); diff --git a/ruoyi-ui/src/views/flowable/task/record/flowview.vue b/ruoyi-ui/src/views/flowable/task/record/flowview.vue index 0542f63..6912a02 100644 --- a/ruoyi-ui/src/views/flowable/task/record/flowview.vue +++ b/ruoyi-ui/src/views/flowable/task/record/flowview.vue @@ -127,7 +127,6 @@ export default { if (completeTask) { canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo') n.outgoing?.forEach(nn => { - debugger const targetTask = this.taskList.find(m => m.key === nn.targetRef.id) if (targetTask) { canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo') diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue index f0cc653..edefcd4 100644 --- a/ruoyi-ui/src/views/flowable/task/record/index.vue +++ b/ruoyi-ui/src/views/flowable/task/record/index.vue @@ -97,7 +97,7 @@ - +
部门列表
- +
待选人员
已选人员
- {{tag.nickName}} {{tag.dept.deptName}} + @close="handleClose(user)"> + {{user.nickName}} {{user.dept.deptName}}
@@ -344,15 +344,17 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.userData = selection - const val = selection.map(item => item.userId)[0]; - if (val instanceof Array) { - this.taskForm.values = { - "approval": val.join(',') - } - } else { - this.taskForm.values = { - "approval": val + if (selection) { + this.userData = selection + const selectVal = selection.map(item => item.userId); + if (selectVal instanceof Array) { + this.taskForm.values = { + "approval": selectVal.join(',') + } + } else { + this.taskForm.values = { + "approval": selectVal + } } } },