|
@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
|
|
|
import com.minto.app.message.beans.MessageBean;
|
|
|
import com.minto.app.message.enums.MessageResourceTypeEnum;
|
|
|
import com.minto.app.message.pipeline.MessagePipeline;
|
|
|
+import com.minto.app.organization.OrgConstants;
|
|
|
import com.minto.app.organization.OrgEnum;
|
|
|
import com.minto.app.organization.beans.OrgPersonBean;
|
|
|
import com.minto.app.organization.manager.IOrgManager;
|
|
@@ -19,6 +20,7 @@ import com.minto.app.task.manager.ITaskManager;
|
|
|
import com.minto.app.task.util.TaskImUtil;
|
|
|
import com.minto.core.common.AppContext;
|
|
|
import com.minto.core.po.BasePO;
|
|
|
+import com.minto.tip.common.authenticate.bo.User;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.commons.lang3.math.NumberUtils;
|
|
@@ -118,7 +120,8 @@ public class WorkProMessagePipeline implements MessagePipeline{
|
|
|
if(task == null){
|
|
|
continue;
|
|
|
}
|
|
|
- TaskImUtil.sendTaskExpireMessage(task, message.getSendTime(), message.getMessage(), message.getReceiverId());
|
|
|
+ TaskImUtil.sendTaskExpireMessage(task, message.getSendTime(), message.getMessage(),
|
|
|
+ message.getReceiverId());
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -147,8 +150,12 @@ public class WorkProMessagePipeline implements MessagePipeline{
|
|
|
if(CollectionUtils.isEmpty(messages)){
|
|
|
return;
|
|
|
}
|
|
|
+ //获取当前用户。由于登录的时候
|
|
|
+ User currentUser = AppContext.getCurrentUser();
|
|
|
+ Long unitId = currentUser != null && currentUser.getAccountId() != null ? currentUser.getAccountId() :
|
|
|
+ OrgConstants.DEFAULT_ACCOUNT_ID;
|
|
|
List<OrgPersonBean> leaderPersonBeans = orgManager.findPersonsByRoleCode(
|
|
|
- OrgEnum.OrgRoleEnum.AccountLeader.name(), AppContext.getCurrentUser().getAccountId());
|
|
|
+ OrgEnum.OrgRoleEnum.AccountLeader.name(), unitId);
|
|
|
|
|
|
List<Long> leaderPersonIds = leaderPersonBeans.stream().map(BasePO::getId).collect(Collectors.toList());
|
|
|
|