diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceOfVisaAllEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceOfVisaAllEventHandler.java index 2e5184d4..7d36e89c 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceOfVisaAllEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceOfVisaAllEventHandler.java @@ -125,9 +125,16 @@ public class ProcessInstanceOfVisaAllEventHandler extends BasicLogSupport implem private void sendCompleteNotice(ProcessInstanceDTO dto) { Map variables = dto.getVariables(); + BpmnTaskDelegateAssigner initiator = dto.getInitiator(); MessageSendReqV3 completeNotice = new MessageSendReqV3(); completeNotice.setSender(PersonV3DTO.builder().build()); - completeNotice.setReceivers(Lists.newArrayList(PersonV3DTO.builder().build())); + completeNotice.setReceivers(Lists.newArrayList(PersonV3DTO.builder() + .id(Long.valueOf(initiator.getPersonId())) + .name(initiator.getAssignerName()) + .imReceiveModel(new PersonV3DTO.ReceiveModel( + StringUtils.hasText(initiator.getOuId()) && !Objects.equals("null", initiator.getOuId()) ? Long.valueOf(initiator.getOuId()) : null, + StringUtils.hasText(initiator.getTenantId()) && !Objects.equals("null", initiator.getTenantId()) ? Long.valueOf(initiator.getTenantId()) : null)) + .build())); completeNotice.setBizEventMappingCode(refreshableConfiguration.getProcessInstanceCompleteMsgEventCode()); completeNotice.setBizCode(dto.getBusinessKey()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -196,9 +203,16 @@ public class ProcessInstanceOfVisaAllEventHandler extends BasicLogSupport implem private void sendRejectNotice(ProcessInstanceDTO dto) { Map variables = dto.getVariables(); + BpmnTaskDelegateAssigner initiator = dto.getInitiator(); MessageSendReqV3 rejectNotice = new MessageSendReqV3(); rejectNotice.setSender(PersonV3DTO.builder().build()); - rejectNotice.setReceivers(Lists.newArrayList(PersonV3DTO.builder().build())); + rejectNotice.setReceivers(Lists.newArrayList(PersonV3DTO.builder() + .id(Long.valueOf(initiator.getPersonId())) + .name(initiator.getAssignerName()) + .imReceiveModel(new PersonV3DTO.ReceiveModel( + StringUtils.hasText(initiator.getOuId()) && !Objects.equals("null", initiator.getOuId()) ? Long.valueOf(initiator.getOuId()) : null, + StringUtils.hasText(initiator.getTenantId()) && !Objects.equals("null", initiator.getTenantId()) ? Long.valueOf(initiator.getTenantId()) : null)) + .build())); rejectNotice.setBizEventMappingCode(refreshableConfiguration.getProcessInstanceRejectMsgEventCode()); rejectNotice.setBizCode(dto.getBusinessKey()); rejectNotice.setBizExtParams(new JSONObject(Maps.of(