需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/NoticeLogic.java

@@ -354,10 +354,10 @@ public class NoticeLogic {
                 .between(NoticeRecord::getIssueTime, dateTime, date1)
                 .list());
 
-        if (adminUser.getType().equals(0)) {
+        if (adminUser.getType().equals(0) && !CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds())) {
             List<NoticeWebsitRecord> noticeWebsitRecords = noticeWebsitRecordService.lambdaQuery()
                     .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), NoticeWebsitRecord::getCompanyWechatId, adminUser.getCompanyWechatId())
-                    .in(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminWebsitIds())
+                    .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminWebsitIds())
                     .eq(NoticeWebsitRecord::getReadFlag, IsYesNoEnum.NO.getKey())
                     .between(NoticeWebsitRecord::getIssueTime, dateTime, date1).list();