|
@@ -349,14 +349,14 @@ public class NoticeLogic {
|
|
|
List<NoticeRecord> list = new ArrayList<>();
|
|
|
list.addAll(noticeRecordService.lambdaQuery()
|
|
|
.in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), NoticeRecord::getAdminCompanyId, adminUser.getCompanyWechatId())
|
|
|
- .eq(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeRecord::getAdminUserId, adminUser.getAdminUserId())
|
|
|
+ .in(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeRecord::getAdminUserId, adminUser.getAdminWebsitIds())
|
|
|
|
|
|
.between(NoticeRecord::getIssueTime, dateTime, date1)
|
|
|
.list());
|
|
|
|
|
|
List<NoticeWebsitRecord> noticeWebsitRecords = noticeWebsitRecordService.lambdaQuery()
|
|
|
.in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), NoticeWebsitRecord::getCompanyWechatId, adminUser.getCompanyWechatId())
|
|
|
- .eq(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminUserId())
|
|
|
+ .in(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminWebsitIds())
|
|
|
.eq(NoticeWebsitRecord::getReadFlag,IsYesNoEnum.NO.getKey())
|
|
|
.between(NoticeWebsitRecord::getIssueTime, dateTime, date1).list();
|
|
|
|