diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java index b0768fdb..883174c0 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardSupport.java @@ -2,6 +2,7 @@ package cn.axzo.msg.center.message.service.card; import cn.axzo.basics.common.exception.ServiceException; import cn.axzo.framework.jackson.utility.JSON; +import cn.axzo.im.center.api.vo.PersonAccountAttribute; import cn.axzo.im.center.api.vo.req.SendTemplateMessageParam; import cn.axzo.im.center.common.enums.AppTypeEnum; import cn.axzo.im.center.common.enums.YesOrNo; @@ -140,7 +141,12 @@ public class CardSupport { }; PushData pushData = template.parsePushData(); SendTemplateMessageParam imRequest = new SendTemplateMessageParam(); - imRequest.setSender(null); + PersonAccountAttribute sender = new PersonAccountAttribute(); + sender.setPersonId(sendModel.getRequest().getSender().getPersonIdOrDefault() + ""); + sender.setOuId(sendModel.getRequest().getSender().getOuIdOrDefault()); + sender.setWorkspaceId(sendModel.getRequest().getSender().getWorkspaceIdOrDefault()); + sender.setAppType(sendModel.getRequest().getImSenderAccountAppType()); + imRequest.setSender(sender); imRequest.setMsgHeader(template.getTitle()); imRequest.setMsgContent(template.getContent()); imRequest.setMsgTemplateId(template.getCode()); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardSendRequest.java b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardSendRequest.java index a3cafe17..8e4e85b3 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardSendRequest.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/CardSendRequest.java @@ -1,5 +1,6 @@ package cn.axzo.msg.center.service.pending.request; +import cn.axzo.im.center.common.enums.AppTypeEnum; import cn.axzo.msg.center.service.dto.PeerPerson; import cn.axzo.msg.center.service.enums.CardBizState; import cn.axzo.msg.center.service.enums.CardState; @@ -60,6 +61,11 @@ public class CardSendRequest implements CardContent { @NotNull(message = "发送人不能为空") private PeerPerson sender = PeerPerson.nonPerson(); + /** + * im发送人账号的端信息, 如果不传默认使用机器人发送 + */ + private AppTypeEnum imSenderAccountAppType; + /** * 接收人 */