From 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:57:28 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java index 1cf95eb..ee8f6ea 100644 --- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java +++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/WorkTaskServiceImplVo.java @@ -1,5 +1,6 @@ package org.jeecg.modules.flowable.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,7 +24,10 @@ HistoricActivityInstance historicActivityInstance=flowMyBusinessService.getPreviousNode(workTaskDataVo.getId()); if (historicActivityInstance != null){ workTaskDataVo.setPreNode(historicActivityInstance.getActivityName()); - workTaskDataVo.setAssignee(historicActivityInstance.getAssignee()); + workTaskDataVo.setPreNodeAssignee(historicActivityInstance.getAssignee()); + } + if (StrUtil.isEmpty(workTaskDataVo.getAssignee())){ + workTaskDataVo.setAssignee(flowMy.getUsername()); } }); return workTaskDataVoIPage; -- Gitblit v1.9.3