From 906cc50a07767d6ee9e45db92378413fdcc2433c Mon Sep 17 00:00:00 2001 From: undefined <13834672+asdadadad@user.noreply.gitee.com> Date: Tue, 16 Apr 2024 11:09:18 +0000 Subject: [PATCH 1/2] fix null dept Signed-off-by: undefined <13834672+asdadadad@user.noreply.gitee.com> --- .../com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 7debaee6..9ffa60f2 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 @@ -786,7 +786,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask SysUser startUser = sysUserService.selectUserById(Long.parseLong(historicProcessInstance.getStartUserId())); flowTask.setStartUserId(startUser.getNickName()); flowTask.setStartUserName(startUser.getNickName()); - flowTask.setStartDeptName(startUser.getDept().getDeptName()); + if(Objects.nonNull(startUser.getDept())) { + flowTask.setStartDeptName(startUser.getDept().getDeptName()); + } hisTaskList.add(flowTask); } page.setTotal(taskInstanceQuery.count()); From 470c5a3bddc5524fda30dca076427dd56631f6dd Mon Sep 17 00:00:00 2001 From: heyizhao Date: Fri, 17 May 2024 09:56:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dbpmn:SequenceFlow?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6panel=E4=B8=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/components/Process/PropertyPanel.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/components/Process/PropertyPanel.vue b/ruoyi-ui/src/components/Process/PropertyPanel.vue index 30834db1..a5b7abcd 100644 --- a/ruoyi-ui/src/components/Process/PropertyPanel.vue +++ b/ruoyi-ui/src/components/Process/PropertyPanel.vue @@ -122,7 +122,9 @@ export default { if (element.type === 'bpmn:Process' || element.type === 'bpmn:SequenceFlow' || element.type === 'bpmn:EndEvent' ) { - this.element = element + this.$nextTick().then(() => { + this.element = element + }) } }) this.modeler.on('selection.changed', e => {