From 82885b9ca8798127763d37f065b16e8e60f81b9b Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 16 Jul 2024 15:18:21 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8Csystem=5Fnotify=5Fmessage=5Freadinfo=E8=A1=A8=E6=9A=82?= =?UTF-8?q?=E4=B8=8D=E8=B5=B0=E5=A4=9A=E6=9C=BA=E6=9E=84=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4DO=E4=B8=AD=E7=9A=84organId=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E6=9A=82?= =?UTF-8?q?=E5=92=8C=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF=E8=B5=B0=E7=9B=B8?= =?UTF-8?q?=E5=90=8Cservice=E5=AE=9E=E7=8E=B0=EF=BC=9B3=E3=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E6=97=B6userId?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E4=BA=8E=E5=85=B3=E8=81=94readinfo=E8=80=8C?= =?UTF-8?q?=E4=B8=8D=E7=AD=9B=E9=80=89message=E8=A1=A8=E6=9C=AC=E8=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/notify/NotifyMessageController.java | 2 ++ .../dataobject/notify/NotifyMessageReadInfoDO.java | 5 ----- .../src/main/resources/application.yaml | 1 + .../mapper/message/NotifyMessageMapper.xml | 13 +++++-------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java index c8354558d..25574f088 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notify/NotifyMessageController.java @@ -46,6 +46,8 @@ public class NotifyMessageController { @Operation(summary = "获得站内信分页") @PreAuthorize("@ss.hasPermission('system:notify-message:query')") public CommonResult> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) { + pageVO.setUserId(getLoginUserId()); + pageVO.setUserType(UserTypeEnum.ADMIN.getValue()); PageResult pageResult = notifyMessageService.getMyMyNotifyMessagePage(pageVO); return success(BeanUtils.toBean(pageResult, NotifyMessageRespVO.class)); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/notify/NotifyMessageReadInfoDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/notify/NotifyMessageReadInfoDO.java index 47d4b0099..a45af8da1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/notify/NotifyMessageReadInfoDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/notify/NotifyMessageReadInfoDO.java @@ -29,11 +29,6 @@ public class NotifyMessageReadInfoDO { @TableId private Long id; - /** - * 组织id - */ - private Long organId; - /** * 站内信消息id */ diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml index 0ac67136f..853140d0c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml @@ -187,6 +187,7 @@ chenfeng: - system_label_element_template - system_data_source - system_notify_message + - system_notify_message_readinfo - system_data_source_field use-data-code: imes_prod #动态数据源标识，后期添加的数据源需要修改此值 diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/message/NotifyMessageMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/message/NotifyMessageMapper.xml index 4cd8097cc..aec9177ac 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/message/NotifyMessageMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/message/NotifyMessageMapper.xml @@ -10,7 +10,7 @@ coalesce(r.id is not null, true) as readStatus , r.read_time readTime from system_notify_message m - left join system_notify_message_readinfo r on r.message_id = m.id + left join system_notify_message_readinfo r on r.message_id = m.id and r.user_id = #{reqVo.userId} r.id is not null @@ -30,7 +30,6 @@ and m.template_type = #{reqVo.templateType} - and m.user_id in (#{reqVo.userId},0) order by m.id desc @@ -38,18 +37,16 @@ \ No newline at end of file