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

Merge remote-tracking branch 'origin/master'

rf
tony 2024-06-02 21:50:26 +08:00
parent 370d647655 d7a99f349b
commit 19e44336f7
2 changed files with 6 additions and 2 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

@ -786,7 +786,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
SysUser startUser = sysUserService.selectUserById(Long.parseLong(historicProcessInstance.getStartUserId())); SysUser startUser = sysUserService.selectUserById(Long.parseLong(historicProcessInstance.getStartUserId()));
flowTask.setStartUserId(startUser.getNickName()); flowTask.setStartUserId(startUser.getNickName());
flowTask.setStartUserName(startUser.getNickName()); flowTask.setStartUserName(startUser.getNickName());
flowTask.setStartDeptName(startUser.getDept().getDeptName()); if(Objects.nonNull(startUser.getDept())) {
flowTask.setStartDeptName(startUser.getDept().getDeptName());
}
hisTaskList.add(flowTask); hisTaskList.add(flowTask);
} }
page.setTotal(taskInstanceQuery.count()); page.setTotal(taskInstanceQuery.count());

4
ruoyi-ui/src/components/Process/PropertyPanel.vue
View File

@ -122,7 +122,9 @@ export default {
if (element.type === 'bpmn:Process' if (element.type === 'bpmn:Process'
|| element.type === 'bpmn:SequenceFlow' || element.type === 'bpmn:SequenceFlow'
|| element.type === 'bpmn:EndEvent' ) { || element.type === 'bpmn:EndEvent' ) {
this.element = element this.$nextTick().then(() => {
this.element = element
})
} }
}) })
this.modeler.on('selection.changed', e => { this.modeler.on('selection.changed', e => {