如果没有角色

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreMessageCenterServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -106,12 +107,14 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
             roles = null;
         }
         //通知
-        List<MessageAppPageVo> messageAppPageVos = coreAnnouncementNotificationMapper.selectAll(loginUser.getOrgId(), roles);
-        List<Long> longs = coreAnnouncementNotificationMapper.selectReadByUser(loginUser.getUserid());
-        List<Long> collect1 = messageAppPageVos.stream().map(MessageAppPageVo::getId).collect(Collectors.toList());
         Integer i = 0;
-        if (CollectionUtils.isNotEmpty(collect1) && null != longs && longs.size() != collect1.size()) {
-            i = collect1.size() - longs.size();
+        if (null!=roles){
+            List<MessageAppPageVo> messageAppPageVos = coreAnnouncementNotificationMapper.selectAll(loginUser.getOrgId(), roles);
+            List<Long> longs = coreAnnouncementNotificationMapper.selectReadByUser(loginUser.getUserid());
+            List<Long> collect1 = messageAppPageVos.stream().map(MessageAppPageVo::getId).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(collect1) && null != longs && longs.size() != collect1.size()) {
+                i = collect1.size() - longs.size();
+            }
         }
         Integer result = 0;
         if (i + integer1 > 0) {