diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java index ad9a149d..acb19ec5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java @@ -26,11 +26,13 @@ public class NoticeController { * 通知设置列表 * * @author fzr + * @param recipient 类型: 1=用户, 2=平台 * @return Object */ @GetMapping("/list") - public Object list() { - List list = iSettingNoticeService.list(); + public Object list(@RequestParam Integer recipient) { + System.out.println(recipient); + List list = iSettingNoticeService.list(recipient); return AjaxResult.success(list); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java index de3020a0..ae576db0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/ISettingNoticeService.java @@ -15,9 +15,10 @@ public interface ISettingNoticeService { * 通知设置列表 * * @author fzr + * @param recipient 1=用户, 2=平台 * @return List */ - List list(); + List list(Integer recipient); /** * 通知设置详情 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java index 5f03b578..250c66cd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java @@ -31,11 +31,13 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService { * 通知设置列表 * * @author fzr + * @param recipient 1=用户, 2=平台 * @return List */ @Override - public List list() { + public List list(Integer recipient) { QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("recipient", recipient); queryWrapper.eq("is_delete", 0); queryWrapper.orderByAsc("id");