Merge remote-tracking branch 'origin/master'

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());

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 => {