From d3acb25a6c8dc0f0c8ffbd406f9f317f0ee72853 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Wed, 1 Jun 2022 10:56:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=AB=99=E5=86=85=E4=BF=A1?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=98=85=E8=AF=BB=E7=8A=B6=E6=80=81=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/notice/controller/SysNoticeController.java      | 3 ++-
 .../src/main/resources/mapper/notice/SysNoticeDao.xml       | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java b/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java
index 28061d89..1dcb445a 100644
--- a/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java
+++ b/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java
@@ -75,6 +75,7 @@ public class SysNoticeController {
             @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
             @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "readStatus", value = "阅读状态  0：未读  1：已读", paramType = "query", dataType = "Integer")
     })
     public Result<PageData<SysNoticeDTO>> myNoticePage(@ApiIgnore @RequestParam Map<String, Object> params) {
         PageData<SysNoticeDTO> page = sysNoticeService.getMyNoticePage(params);
@@ -91,7 +92,7 @@ public class SysNoticeController {
     }
 
     @GetMapping("mynotice/unread")
-    @ApiOperation("我的通知未读读")
+    @ApiOperation("我的通知未读数")
     public Result<Integer> unRead() {
         int count = sysNoticeUserService.getUnReadNoticeCount(SecurityUser.getUserId());
 
diff --git a/renren-admin/src/main/resources/mapper/notice/SysNoticeDao.xml b/renren-admin/src/main/resources/mapper/notice/SysNoticeDao.xml
index 7b9a1dc6..2c4b2056 100644
--- a/renren-admin/src/main/resources/mapper/notice/SysNoticeDao.xml
+++ b/renren-admin/src/main/resources/mapper/notice/SysNoticeDao.xml
@@ -12,6 +12,10 @@
     <!-- 获取我的通知列表 -->
     <select id="getMyNoticeList" resultType="io.renren.modules.notice.entity.SysNoticeEntity">
         select t2.id, t2.title, t2.type, t2.sender_name, t2.sender_date, t1.read_status from sys_notice_user t1, sys_notice t2
-        where t1.notice_id = t2.id and t1.receiver_id = #{receiverId} order by t2.create_date desc
+        where t1.notice_id = t2.id and t1.receiver_id = #{receiverId}
+        <if test="readStatus != null">
+            AND read_status = #{readStatus}
+        </if>
+        order by t2.create_date desc
     </select>
 </mapper>
\ No newline at end of file