‘linchangsheng’ 6 months ago
parent
commit
d378fef924

+ 11 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/NoticeWebsitLogic.java

@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -156,7 +157,17 @@ public class NoticeWebsitLogic {
 
     public Object unreadCount(HttpServletRequest request, String readFlag) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
+
+        List<String> collect = noticeWebsitService.lambdaQuery()
+                .eq(NoticeWebsit::getStatus, "SEND").select(NoticeWebsit::getNoticeWebsitId)
+                .list().stream().map(NoticeWebsit::getNoticeWebsitId).collect(Collectors.toList());
+
+        if (CollectionUtils.isEmpty(collect)) {
+            return 0;
+        }
+
         Integer count = noticeWebsitRecordService.lambdaQuery()
+                .in(NoticeWebsitRecord::getNoticeWebsitId,collect)
                 .eq(NoticeWebsitRecord::getReadFlag, readFlag)
                 .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()),NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminWebsitIds())
                 .count();