|
@@ -165,15 +165,15 @@ public class GlobalActivityEventListener extends AbstractFlowableEngineEventList
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 判断是否是最后一个节点
|
|
|
- boolean isLastNode = currentFlowElement.getId().equals(endActivityId);
|
|
|
log.info("flowElement.getId: {}", endActivityId);
|
|
|
log.info("currentFlowElement.getId: {}", currentFlowElement.getId());
|
|
|
|
|
|
- if (isLastNode) {
|
|
|
+ // 判断是否是最后一个节点
|
|
|
+ if ("end".equals(endActivityId)) {
|
|
|
// 最后一个节点,消息发送人为当前登录用户
|
|
|
- log.info("这是最后一个节点,登录用户{}", SecurityContextUtil.getUserInfo().getUsername());
|
|
|
- notify.setSender(Objects.requireNonNull(SecurityContextUtil.getUserInfo()).getUsername());
|
|
|
+ String username = Objects.requireNonNull(SecurityContextUtil.getUserInfo()).getUsername();
|
|
|
+ log.info("这是最后一个节点,登录用户{}", username);
|
|
|
+ notify.setSender(username);
|
|
|
} else {
|
|
|
// 其余节点,消息发送人为发起人
|
|
|
notify.setSender(startUserId);
|