消息中心修复租户隔离、消息分类大类

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -69,7 +69,8 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         LambdaQueryWrapper<MceContent> lambdaQuery1 = Wrappers.lambdaQuery();
         lambdaQuery1.select(MceContent::getId, MceContent::getInfoTitle, MceContent::getInfoContent)
                 .like(StringUtils.isNotBlank(infoTitle), MceContent::getInfoTitle, infoTitle)
-                .eq(id != null, MceContent::getId, id);
+                .eq(id != null, MceContent::getId, id)
+                .eq(MceContent::getTenantId, SecurityUtils.getTenantId());
         List<MceContent> list1 = mceContentService.list(lambdaQuery1);
         IPage<MceReceive> page = new Page<>(current, size);
         List<Integer> contentIds = new ArrayList<>();
@@ -92,6 +93,8 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
             if (StringUtils.isNotBlank(infoTypeBig)) {
                 if ("2".equals(infoTypeBig)) {
                     lambdaQuery.in(MceReceive::getInfoType, "2", "5");
+                } else {
+                    lambdaQuery.eq(MceReceive::getInfoType, infoTypeBig);
                 }
             }