diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java index c29e544..d4250e0 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java @@ -3,6 +3,8 @@ package com.bonus.material.basic.service.impl; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + import com.alibaba.fastjson2.JSONObject; import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.core.exception.ServiceException; @@ -47,13 +49,18 @@ public class BmMessageServiceImpl implements IBmMessageService { */ @Override public List selectBmMessageList(BmMessage bmMessage) { + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + bmMessage.setFromCompany(companyId); + bmMessage.setToCompany(companyId); return bmMessageMapper.selectBmMessageList(bmMessage); } @Override public List selectBmMessageListFromCache(BmMessage bmMessage) { List bmMessages = redisService.getCacheList(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE); - return bmMessages; + Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); + List result = bmMessages.stream().filter(o -> companyId.equals(o.getFromCompany()) || companyId.equals(o.getToCompany())).collect(Collectors.toList()); + return result; } /**