|
|
@@ -117,11 +117,13 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
|
|
|
}else{
|
|
|
page = new Page<>();
|
|
|
}
|
|
|
- page = coreAnnouncementNotificationMapper.selectAppPage(page, request);
|
|
|
- if(page!=null&&CollectionUtil.isNotEmpty(page.getRecords())){
|
|
|
- page = this.buildNewNotificationAppPageVo(page,request);
|
|
|
- }
|
|
|
+ if(CollectionUtil.isNotEmpty(request.getTagRoleIds())){
|
|
|
+ page = coreAnnouncementNotificationMapper.selectAppPage(page, request);
|
|
|
+ if(page!=null&&CollectionUtil.isNotEmpty(page.getRecords())){
|
|
|
+ page = this.buildNewNotificationAppPageVo(page,request);
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
//抓换为TableDataInfo适配前端
|
|
|
return TableDataInfo.build(page);
|
|
|
}
|