|
|
@@ -3,6 +3,7 @@ package com.uas.ps.message.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.account.entity.User;
|
|
|
+import com.uas.account.entity.UserView;
|
|
|
import com.uas.account.util.AccountUtils;
|
|
|
import com.uas.account.util.FlexJsonUtil;
|
|
|
import com.uas.ps.message.dao.AppDao;
|
|
|
@@ -267,7 +268,7 @@ public class MessageServiceImpl implements MessageService {
|
|
|
if (!CollectionUtils.isEmpty(messages)) {
|
|
|
for (Message message : messages) {
|
|
|
try {
|
|
|
- User receiver = AccountUtils.getImUserByUserUU(message.getReceiverUu(), message.getReceiverEnuu());
|
|
|
+ UserView receiver = AccountUtils.getImUserByUserUU(message.getReceiverUu(), message.getReceiverEnuu());
|
|
|
logger.info("接收人:" + receiver.getName());
|
|
|
// 发送邮件
|
|
|
// if (message.getSmsType().contains(SMSType.MAIL)) {
|
|
|
@@ -333,10 +334,10 @@ public class MessageServiceImpl implements MessageService {
|
|
|
List<Object> obj = new ArrayList<Object>();
|
|
|
obj.add(receiver.getName());
|
|
|
|
|
|
- User sender = AccountUtils.getImUserByUserUU(message.getSenderUu(), message.getSenderEnuu());
|
|
|
+ UserView sender = AccountUtils.getImUserByUserUU(message.getSenderUu(), message.getSenderEnuu());
|
|
|
logger.info("发送人:" + sender.getName());
|
|
|
if (sender != null) {
|
|
|
- obj.add(sender.getName());
|
|
|
+ obj.add(sender.getSpaceName());
|
|
|
obj.add(message.getRemark());
|
|
|
sms.setParams(obj);
|
|
|
sms.setReceiver(receiver.getUid());
|