From 2f98e628401034e63fbaa65ed1920d632ff0282f Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 30 Aug 2022 17:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mdd/admin/controller/setting/NoticeController.java  | 6 ++++--
 .../mdd/admin/service/setting/ISettingNoticeService.java    | 3 ++-
 .../service/setting/impl/SettingNoticeServiceImpl.java      | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

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<NoticeListVo> list = iSettingNoticeService.list();
+    public Object list(@RequestParam Integer recipient) {
+        System.out.println(recipient);
+        List<NoticeListVo> 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<NoticeSettingListVo>
      */
-    List<NoticeListVo> list();
+    List<NoticeListVo> 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<NoticeSettingListVo>
      */
     @Override
-    public List<NoticeListVo> list() {
+    public List<NoticeListVo> list(Integer recipient) {
         QueryWrapper<NoticeSetting> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("recipient", recipient);
         queryWrapper.eq("is_delete", 0);
         queryWrapper.orderByAsc("id");