Merge branch 'future/flowable' of https://gitee.com/dromara/RuoYi-Vue-Plus into future/flowable

This commit is contained in:
songgaoshuai 2023-11-03 13:43:44 +08:00
commit 2093b6d990

View File

@ -367,16 +367,20 @@ public class WorkflowUtils {
} }
if (CollUtil.isNotEmpty(userIds)) { if (CollUtil.isNotEmpty(userIds)) {
List<SysUserVo> sysUserVoList = I_WORKFLOW_USER_SERVICE.getUserListByIds(new ArrayList<>(userIds)); List<SysUserVo> sysUserVoList = I_WORKFLOW_USER_SERVICE.getUserListByIds(new ArrayList<>(userIds));
if (messageType.contains(MessageTypeEnum.SYSTEM_MESSAGE.getCode())) { for (String code : messageType) {
if (code.equals(MessageTypeEnum.SYSTEM_MESSAGE.getCode())) {
WebSocketMessageDto dto = new WebSocketMessageDto(); WebSocketMessageDto dto = new WebSocketMessageDto();
dto.setSessionKeys(new ArrayList<>(userIds)); dto.setSessionKeys(new ArrayList<>(userIds));
dto.setMessage(message); dto.setMessage(message);
WebSocketUtils.publishMessage(dto); WebSocketUtils.publishMessage(dto);
} else if (messageType.contains(MessageTypeEnum.EMAIL_MESSAGE.getCode())) { }
if (code.equals(MessageTypeEnum.EMAIL_MESSAGE.getCode())) {
MailUtils.sendText(StreamUtils.join(sysUserVoList, SysUserVo::getEmail), "单据审批提醒", message); MailUtils.sendText(StreamUtils.join(sysUserVoList, SysUserVo::getEmail), "单据审批提醒", message);
} else if (messageType.contains(MessageTypeEnum.SMS_MESSAGE.getCode())) { }
if (code.equals(MessageTypeEnum.SMS_MESSAGE.getCode())) {
//todo 短信发送 //todo 短信发送
} }
} }
} }
} }
}