|
@@ -133,7 +133,7 @@ public class GlobalActivityEventListener extends AbstractFlowableEngineEventList
|
|
Notify notify = new Notify();
|
|
Notify notify = new Notify();
|
|
notify.setSubject("新的审批任务");
|
|
notify.setSubject("新的审批任务");
|
|
notify.setContent(String.format("您有一条待处理的审批任务【%s】,请及时处理。", entity.getName()));
|
|
notify.setContent(String.format("您有一条待处理的审批任务【%s】,请及时处理。", entity.getName()));
|
|
- notify.setSender(SecurityContextUtil.getNickName());
|
|
|
|
|
|
+ notify.setSender(SecurityContextUtil.getUserId());
|
|
notify.setType(NotifyEnum.TODO);
|
|
notify.setType(NotifyEnum.TODO);
|
|
notify.setReceiver(entity.getAssignee());
|
|
notify.setReceiver(entity.getAssignee());
|
|
notify.setReceivingTime(LocalDateTime.now());
|
|
notify.setReceivingTime(LocalDateTime.now());
|
|
@@ -182,7 +182,7 @@ public class GlobalActivityEventListener extends AbstractFlowableEngineEventList
|
|
Notify notify = new Notify();
|
|
Notify notify = new Notify();
|
|
notify.setSubject("申请已通过");
|
|
notify.setSubject("申请已通过");
|
|
notify.setContent(String.format("您申请的流程《%s》已通过", entity.getName()));
|
|
notify.setContent(String.format("您申请的流程《%s》已通过", entity.getName()));
|
|
- notify.setSender(SecurityContextUtil.getNickName());
|
|
|
|
|
|
+ notify.setSender(entity.getStartUserId());
|
|
notify.setType(NotifyEnum.SYSTEM);
|
|
notify.setType(NotifyEnum.SYSTEM);
|
|
notify.setReceiver(entity.getStartUserId());
|
|
notify.setReceiver(entity.getStartUserId());
|
|
notify.setReceivingTime(LocalDateTime.now());
|
|
notify.setReceivingTime(LocalDateTime.now());
|