fix:修复系统模块首页通知数据隔离bug

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/index/service/impl/BizIndexServiceImpl.java

@@ -18,6 +18,8 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
+import vip.xiaonuo.auth.core.pojo.SaBaseLoginUser;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.biz.modular.index.param.BizIndexNoticeIdParam;
 import vip.xiaonuo.biz.modular.index.param.BizIndexNoticeListParam;
 import vip.xiaonuo.biz.modular.index.param.BizIndexSlideshowListParam;
@@ -28,7 +30,9 @@ import vip.xiaonuo.biz.modular.index.service.BizIndexService;
 import vip.xiaonuo.biz.modular.notice.entity.BizNotice;
 import vip.xiaonuo.biz.modular.notice.enums.BizNoticeStatusEnum;
 import vip.xiaonuo.biz.modular.notice.service.BizNoticeService;
+import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
 import vip.xiaonuo.dev.api.DevSlideshowApi;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,7 +40,7 @@ import java.util.stream.Collectors;
  * 业务首页Service接口实现类
  *
  * @author yubaoshan
- * @date  2024/07/13 00:31
+ * @date 2024/07/13 00:31
  */
 @Service
 public class BizIndexServiceImpl implements BizIndexService {
@@ -56,12 +60,15 @@ public class BizIndexServiceImpl implements BizIndexService {
 
     @Override
     public List<BizIndexNoticeListResult> noticeListByLimit(BizIndexNoticeListParam bizIndexNoticeListParam) {
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         return bizNoticeService.list(new LambdaQueryWrapper<BizNotice>()
-                    .eq(BizNotice::getStatus, BizNoticeStatusEnum.ENABLE.getValue())
-                    .orderByAsc(BizNotice::getCreateTime)
+                        .eq(BizNotice::getStatus, BizNoticeStatusEnum.ENABLE.getValue())
+                        .eq(BizNotice::getCreateOrg, loginUser.getOrgId())
+                        .eq(BizNotice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE)
+                        .orderByAsc(BizNotice::getCreateTime)
                 )
                 .stream()
-                .limit(ObjectUtil.isNotEmpty(bizIndexNoticeListParam.getLimit())? bizIndexNoticeListParam.getLimit().longValue() : 10)
+                .limit(ObjectUtil.isNotEmpty(bizIndexNoticeListParam.getLimit()) ? bizIndexNoticeListParam.getLimit().longValue() : 10)
                 .map(notice -> JSONUtil.toBean(JSONUtil.toJsonStr(notice), BizIndexNoticeListResult.class)).collect(Collectors.toList());
     }